Merge from vscode 1b314ab317fbff7d799b21754326b7d849889ceb

.devcontainer/Dockerfile

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-10
+FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-12
 
 ARG TARGET_DISPLAY=":1"
 

.devcontainer/README.md

@@ -6,9 +6,9 @@ This repository includes configuration for a development container for working w
 
 ## Quick start - local
 
-1. Install Docker Desktop or Docker on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.)
+1. Install Docker Desktop or Docker for Linux on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.)
 
-2. [Docker Desktop] If you are not using the new WSL2 Docker Desktop engine, increase the resources allocated to Docker Desktop to at least **4 Cores and 4 GB of RAM (8 GB recommended)**. Right-click on the Docker status bar item, go to **Preferences/Settings > Resources > Advanced** to do so.
+2. **Important**: Docker needs at least **4 Cores and 6 GB of RAM (8 GB recommended)** to run full build. If you on macOS, or using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item, going to **Preferences/Settings > Resources > Advanced**.
 
     > **Note:** The [Resource Monitor](https://marketplace.visualstudio.com/items?itemName=mutantdino.resourcemonitor) extension is included in the container so you can keep an eye on CPU/Memory in the status bar.
 
@@ -44,7 +44,7 @@ Next: **[Try it out!](#try-it)**
 
 3. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> and select **Codespaces: Create New Codespace**.
 
-4. Use default settings, select a plan, and then enter the repository URL `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box when prompted.
+4. Use default settings (which should include **Standard** 4 core, 8 GB RAM Codespace), select a plan, and then enter the repository URL `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box when prompted.
 
 5. After the container is running, open a web browser and go to [http://localhost:6080](http://localhost:6080) or use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
 

.devcontainer/devcontainer.json

@@ -12,7 +12,11 @@
 		}
 	},
 	"overrideCommand": false,
-	"runArgs": ["--init"],
+	"runArgs": [
+		"--init",
+		// seccomp=unconfined is required for Chrome sandboxing
+		"--security-opt", "seccomp=unconfined"
+	],
 
 	"settings": {
 		// zsh is also available

.vscode/extensions.json

@@ -4,7 +4,6 @@
 	"recommendations": [
 		"dbaeumer.vscode-eslint",
 		"EditorConfig.EditorConfig",
-		"msjsdiag.debugger-for-chrome",
+		"msjsdiag.debugger-for-chrome"
-		"ms-vscode.vscode-github-issue-notebooks"
 	]
 }

.vscode/launch.json

@@ -92,6 +92,7 @@
 			"env": {
 				"VSCODE_EXTHOST_WILL_SEND_SOCKET": null
 			},
+			"cleanUp": "wholeBrowser",
 			"breakOnLoad": false,
 			"urlFilter": "*workbench.html*",
 			"runtimeArgs": [

.vscode/notebooks/api.github-issues

@@ -0,0 +1,38 @@
+[
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "#### Config",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"July 2020\"",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### Finalization",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repo $milestone label:api-finalization",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### Proposals",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repo $milestone is:open label:api-proposal ",
+    "editable": true
+  }
+]

.vscode/notebooks/inbox.github-issues

@@ -2,12 +2,14 @@
   {
     "kind": 1,
     "language": "markdown",
-    "value": "##### `Config`: defines the inbox query"
+    "value": "##### `Config`: defines the inbox query",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$inbox=repo:microsoft/vscode is:open no:assignee -label:feature-request -label:testplan-item -label:plan-item "
+    "value": "$inbox=repo:microsoft/vscode is:open no:assignee -label:feature-request -label:testplan-item -label:plan-item ",
+    "editable": true
   },
   {
     "kind": 1,
@@ -18,7 +20,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$inbox -label:\"needs more info\"",
+    "value": "$inbox -label:\"needs more info\" -label:emmet",
     "editable": true
   },
   {
@@ -31,6 +33,6 @@
     "kind": 2,
     "language": "github-issues",
     "value": "$inbox",
-    "editable": true
+    "editable": false
   }
 ]

.vscode/notebooks/my-work.github-issues

@@ -20,7 +20,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos $milestone assignee:@me is:open\n",
+    "value": "$repos $milestone assignee:@me is:open",
     "editable": false
   },
   {

.vscode/notebooks/verification.github-issues

@@ -0,0 +1,55 @@
+[
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### Bug Verification Queries\n\nBefore shipping we want to verify _all_ bugs. That means when a bug is fixed we check that the fix actually works. It's always best to start with bugs that you have filed and the proceed with bugs that have been filed from users outside the development team. ",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "#### Config: update list of `repos` and the `milestone`",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"June 2020\"",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### Bugs You Filed",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate author:@me",
+    "editable": false
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### Bugs From Outside",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos $milestone is:closed  -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl  -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand",
+    "editable": false
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### All"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate",
+    "editable": false
+  }
+]

.vscode/searches/es6.code-search

@@ -2,7 +2,7 @@
 # Flags: CaseSensitive WordMatch
 # ContextLines: 2
 
-16 results - 5 files
+14 results - 4 files
 
 src/vs/base/browser/dom.ts:
   81  };
@@ -34,24 +34,11 @@ src/vs/base/common/arrays.ts:
   420   */
   421  export function first<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T): T;
 
-  560  
+  569  
-  561  /**
+  570  /**
-  562:  * @deprecated ES6: use `Array.find`
+  571:  * @deprecated ES6: use `Array.find`
-  563   */
+  572   */
-  564  export function find<T>(arr: ArrayLike<T>, predicate: (value: T, index: number, arr: ArrayLike<T>) => any): T | undefined {
+  573  export function find<T>(arr: ArrayLike<T>, predicate: (value: T, index: number, arr: ArrayLike<T>) => any): T | undefined {
-
-src/vs/base/common/map.ts:
-  11  
-  12  /**
-  13:  * @deprecated ES6: use `[...SetOrMap.values()]`
-  14   */
-  15  export function values<V = any>(set: Set<V>): V[];
-
-  22  
-  23  /**
-  24:  * @deprecated ES6: use `[...map.keys()]`
-  25   */
-  26  export function keys<K, V>(map: Map<K, V>): K[] {
 
 src/vs/base/common/objects.ts:
   115  

.vscode/tasks.json

@@ -3,12 +3,8 @@
 	"tasks": [
 		{
 			"type": "npm",
-			"script": "watchd",
+			"script": "watch-clientd",
-			"label": "Build VS Code",
+			"label": "Build VS Code Core",
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			},
 			"isBackground": true,
 			"presentation": {
 				"reveal": "never"
@@ -31,6 +27,43 @@
 				}
 			}
 		},
+		{
+			"type": "npm",
+			"script": "watch-extensionsd",
+			"label": "Build VS Code Extensions",
+			"isBackground": true,
+			"presentation": {
+				"reveal": "never"
+			},
+			"problemMatcher": {
+				"owner": "typescript",
+				"applyTo": "closedDocuments",
+				"fileLocation": [
+					"absolute"
+				],
+				"pattern": {
+					"regexp": "Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$",
+					"file": 1,
+					"location": 2,
+					"message": 3
+				},
+				"background": {
+					"beginsPattern": "Starting compilation",
+					"endsPattern": "Finished compilation"
+				}
+			}
+		},
+		{
+			"label": "Build VS Code",
+			"dependsOn": [
+				"Build VS Code Core",
+				"Build VS Code Extensions"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		},
 		{
 			"type": "npm",
 			"script": "strict-vscode-watch",
@@ -55,6 +88,14 @@
 			},
 			"problemMatcher": "$tsc"
 		},
+		{
+			"label": "Kill Build VS Code",
+			"dependsOn": [
+				"Kill Build VS Code Core",
+				"Kill Build VS Code Extensions"
+			],
+			"group": "build"
+		},
 		{
 			"type": "npm",
 			"script": "watch-webd",

.yarnrc

@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "7.3.2"
+target "8.3.3"
 runtime "electron"

build/gulpfile.vscode.js

@@ -36,23 +36,6 @@ const { compileBuildTask } = require('./gulpfile.compile');
 const { compileExtensionsBuildTask } = require('./gulpfile.extensions');
 
 const productionDependencies = deps.getProductionDependencies(path.dirname(__dirname));
-const baseModules = Object.keys(process.binding('natives')).filter(n => !/^_|\//.test(n));
-const nodeModules = [ // {{SQL CARBON EDIT}}
-	'electron',
-	'original-fs',
-	'rxjs/Observable',
-	'rxjs/add/observable/fromPromise',
-	'rxjs/Subject',
-	'rxjs/Observer',
-	'slickgrid/lib/jquery.event.drag-2.3.0',
-	'slickgrid/lib/jquery-ui-1.9.2',
-	'slickgrid/slick.core',
-	'slickgrid/slick.grid',
-	'slickgrid/slick.editors',
-	'slickgrid/slick.dataview']
-	.concat(Object.keys(product.dependencies || {}))
-	.concat(_.uniq(productionDependencies.map(d => d.name)))
-	.concat(baseModules);
 
 // Build
 const vscodeEntryPoints = _.flatten([
@@ -75,6 +58,7 @@ const vscodeResources = [
 	'out-build/paths.js',
 	'out-build/vs/**/*.{svg,png,html}',
 	'!out-build/vs/code/browser/**/*.html',
+	'!out-build/vs/editor/standalone/**/*.svg',
 	'out-build/vs/base/common/performance.js',
 	'out-build/vs/base/node/languagePacks.js',
 	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}',
@@ -123,7 +107,7 @@ const optimizeVSCodeTask = task.define('optimize-vscode', task.series(
 		src: 'out-build',
 		entryPoints: vscodeEntryPoints,
 		resources: vscodeResources,
-		loaderConfig: common.loaderConfig(nodeModules),
+		loaderConfig: common.loaderConfig(),
 		out: 'out-vscode',
 		bundleInfo: undefined
 	})
@@ -134,12 +118,6 @@ const sourceMappingURLBase = `https://sqlopsbuilds.blob.core.windows.net/sourcem
 const minifyVSCodeTask = task.define('minify-vscode', task.series(
 	optimizeVSCodeTask,
 	util.rimraf('out-vscode-min'),
-	() => {
-		const fullpath = path.join(process.cwd(), 'out-vscode/bootstrap-window.js');
-		const contents = fs.readFileSync(fullpath).toString();
-		const newContents = contents.replace('[/*BUILD->INSERT_NODE_MODULES*/]', JSON.stringify(nodeModules));
-		fs.writeFileSync(fullpath, newContents);
-	},
 	common.minifyTask('out-vscode', `${sourceMappingURLBase}/core`)
 ));
 gulp.task(minifyVSCodeTask);

build/gulpfile.vscode.win32.js

@@ -94,8 +94,8 @@ function buildWin32Setup(arch, target) {
 			IncompatibleTargetAppId: { 'ia32': product.win32AppId, 'x64': product.win32x64AppId, 'arm64': product.win32arm64AppId }[arch],
 			IncompatibleArchAppId: { 'ia32': x64AppId, 'x64': ia32AppId, 'arm64': ia32AppId }[arch],
 			AppUserId: product.win32AppUserModelId,
-			ArchitecturesAllowed: { 'ia32': '', 'x64': 'x64', 'arm64': '' }[arch],
+			ArchitecturesAllowed: { 'ia32': '', 'x64': 'x64', 'arm64': 'arm64' }[arch],
-			ArchitecturesInstallIn64BitMode: { 'ia32': '', 'x64': 'x64', 'arm64': '' }[arch],
+			ArchitecturesInstallIn64BitMode: { 'ia32': '', 'x64': 'x64', 'arm64': 'arm64' }[arch],
 			SourceDir: sourcePath,
 			RepoDir: repoPath,
 			OutputDir: outputPath,

build/lib/compilation.js

@@ -18,6 +18,7 @@ const reporter_1 = require("./reporter");
 const util = require("./util");
 const fancyLog = require("fancy-log");
 const ansiColors = require("ansi-colors");
+const os = require("os");
 const watch = require('./watch');
 const reporter = reporter_1.createReporter();
 function getTypeScriptCompilerOptions(src) {
@@ -69,6 +70,9 @@ function createCompile(src, build, emitError) {
 }
 function compileTask(src, out, build) {
     return function () {
+        if (os.totalmem() < 4000000000) {
+            throw new Error('compilation requires 4GB of RAM');
+        }
         const compile = createCompile(src, build, true);
         const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
         let generator = new MonacoGenerator(false);

build/lib/compilation.ts

@@ -18,6 +18,7 @@ import { createReporter } from './reporter';
 import * as util from './util';
 import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
+import * as os from 'os';
 import ts = require('typescript');
 
 const watch = require('./watch');
@@ -81,6 +82,11 @@ function createCompile(src: string, build: boolean, emitError?: boolean) {
 export function compileTask(src: string, out: string, build: boolean): () => NodeJS.ReadWriteStream {
 
 	return function () {
+
+		if (os.totalmem() < 4_000_000_000) {
+			throw new Error('compilation requires 4GB of RAM');
+		}
+
 		const compile = createCompile(src, build, true);
 		const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
 		let generator = new MonacoGenerator(false);

build/lib/i18n.js

@@ -1147,12 +1147,7 @@ function createIslFile(originalFilePath, messages, language, innoSetup) {
         if (line.length > 0) {
             let firstChar = line.charAt(0);
             if (firstChar === '[' || firstChar === ';') {
-                if (line === '; *** Inno Setup version 5.5.3+ English messages ***') {
+                content.push(line);
-                    content.push(`; *** Inno Setup version 5.5.3+ ${innoSetup.defaultInfo.name} messages ***`);
-                }
-                else {
-                    content.push(line);
-                }
             }
             else {
                 let sections = line.split('=');

build/lib/i18n.ts

@@ -1316,11 +1316,7 @@ function createIslFile(originalFilePath: string, messages: Map<string>, language
 		if (line.length > 0) {
 			let firstChar = line.charAt(0);
 			if (firstChar === '[' || firstChar === ';') {
-				if (line === '; *** Inno Setup version 5.5.3+ English messages ***') {
+				content.push(line);
-					content.push(`; *** Inno Setup version 5.5.3+ ${innoSetup.defaultInfo!.name} messages ***`);
-				} else {
-					content.push(line);
-				}
 			} else {
 				let sections: string[] = line.split('=');
 				let key = sections[0];

build/lib/optimize.js

@@ -28,14 +28,15 @@ const REPO_ROOT_PATH = path.join(__dirname, '../..');
 function log(prefix, message) {
     fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
 }
-function loaderConfig(emptyPaths) {
+function loaderConfig() {
     const result = {
         paths: {
             'vs': 'out-build/vs',
             'sql': 'out-build/sql',
-            'vscode': 'empty:'
+            'vscode': 'empty:',
+            'azdata': 'empty:' // {{SQL CARBON EDIT}}
         },
-        nodeModules: emptyPaths || []
+        amdModulesPattern: /^(vs|sql)\// // {{SQL CARBON EDIT}} include sql in regex
     };
     result['vs/css'] = { inlineResources: true };
     return result;

build/lib/optimize.ts

@@ -32,14 +32,15 @@ function log(prefix: string, message: string): void {
 	fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
 }
 
-export function loaderConfig(emptyPaths?: string[]) {
+export function loaderConfig() {
 	const result: any = {
 		paths: {
 			'vs': 'out-build/vs',
 			'sql': 'out-build/sql', // {{SQL CARBON EDIT}}
-			'vscode': 'empty:'
+			'vscode': 'empty:',
+			'azdata': 'empty:' // {{SQL CARBON EDIT}}
 		},
-		nodeModules: emptyPaths || []
+		amdModulesPattern: /^(vs|sql)\// // {{SQL CARBON EDIT}} include sql in regex
 	};
 
 	result['vs/css'] = { inlineResources: true };

build/npm/postinstall.js

@@ -33,7 +33,7 @@ function yarnInstall(location, opts) {
 
 yarnInstall('extensions'); // node modules shared by all extensions
 
-if (!(process.platform === 'win32' && process.env['npm_config_arch'] === 'arm64')) {
+if (!(process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64'))) {
 	yarnInstall('remote'); // node modules used by vscode server
 	yarnInstall('remote/web'); // node modules used by vscode web
 }
@@ -73,3 +73,5 @@ yarnInstall('test/automation'); // node modules required for smoketest
 yarnInstall('test/smoke'); // node modules required for smoketest
 yarnInstall('test/integration/browser'); // node modules required for integration
 yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
+
+cp.execSync('git config pull.rebase true');

build/package.json

@@ -40,7 +40,7 @@
     "gulp-bom": "^1.0.0",
     "gulp-sourcemaps": "^1.11.0",
     "gulp-uglify": "^3.0.0",
-    "iconv-lite-umd": "0.6.5",
+    "iconv-lite-umd": "0.6.8",
     "mime": "^1.3.4",
     "minimatch": "3.0.4",
     "minimist": "^1.2.3",
@@ -49,7 +49,7 @@
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "terser": "4.3.8",
-    "typescript": "^4.0.0-dev.20200629",
+    "typescript": "^4.0.0-dev.20200708",
     "vsce": "1.48.0",
     "vscode-telemetry-extractor": "^1.6.0",
     "xml2js": "^0.4.17"

build/win32/code.iss

@@ -34,6 +34,7 @@ VersionInfoVersion={#RawVersion}
 ShowLanguageDialog=auto
 ArchitecturesAllowed={#ArchitecturesAllowed}
 ArchitecturesInstallIn64BitMode={#ArchitecturesInstallIn64BitMode}
+WizardStyle=modern
 
 #ifdef Sign
 SignTool=esrp
@@ -47,7 +48,7 @@ DefaultDirName={pf}\{#DirName}
 #endif
 
 [Languages]
-Name: "english"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.isl,{#RepoDir}\build\win32\i18n\messages.en.isl" {#LocalizedLanguageFile}
+Name: "english"; MessagesFile: "compiler: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")}
@@ -58,7 +59,7 @@ Name: "korean"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.ko.isl,{#Repo
 Name: "simplifiedChinese"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.zh-cn.isl,{#RepoDir}\build\win32\i18n\messages.zh-cn.isl" {#LocalizedLanguageFile("chs")}
 Name: "traditionalChinese"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.zh-tw.isl,{#RepoDir}\build\win32\i18n\messages.zh-tw.isl" {#LocalizedLanguageFile("cht")}
 Name: "brazilianPortuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl,{#RepoDir}\build\win32\i18n\messages.pt-br.isl" {#LocalizedLanguageFile("ptb")}
-Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl,{#RepoDir}\build\win32\i18n\messages.hu.isl" {#LocalizedLanguageFile("hun")}
+Name: "hungarian"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.hu.isl,{#RepoDir}\build\win32\i18n\messages.hu.isl" {#LocalizedLanguageFile("hun")}
 Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl,{#RepoDir}\build\win32\i18n\messages.tr.isl" {#LocalizedLanguageFile("trk")}
 
 [InstallDelete]
@@ -147,7 +148,7 @@ begin
   Result := True;
 
   #if "user" == InstallTarget
-    if not WizardSilent() and IsAdminLoggedOn() then begin
+    if not WizardSilent() and IsAdmin() then begin
       if MsgBox('This User Installer is not meant to be run as an Administrator. If you would like to install Azure Data Studio for all users in this system, download the System Installer instead from https://docs.microsoft.com/sql/azure-data-studio/download. Are you sure you want to continue?', mbError, MB_OKCANCEL) = IDCANCEL then begin
         Result := False;
       end;

build/win32/i18n/Default.hu.isl

@@ -0,0 +1,366 @@
+;Inno Setup version 6.0.3+ Hungarian messages
+;Based on the translation of Kornél Pál, kornelpal@gmail.com
+;István Szabó, E-mail: istvanszabo890629@gmail.com
+;
+; To download user-contributed translations of this file, go to:
+;   http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and 
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=Magyar
+LanguageID=$040E
+LanguageCodePage=1250
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial CE
+;TitleFontSize=29
+;CopyrightFontName=Arial CE
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Telepítő
+SetupWindowTitle=%1 - Telepítő
+UninstallAppTitle=Eltávolító
+UninstallAppFullTitle=%1 Eltávolító
+
+; *** Misc. common
+InformationTitle=Információk
+ConfirmTitle=Megerősít
+ErrorTitle=Hiba
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=%1 telepítve lesz. Szeretné folytatni?
+LdrCannotCreateTemp=Átmeneti fájl létrehozása nem lehetséges. A telepítés megszakítva
+LdrCannotExecTemp=Fájl futtatása nem lehetséges az átmeneti könyvtárban. A telepítés megszakítva
+HelpTextNote=
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nHiba %2: %3
+SetupFileMissing=A(z) %1 fájl hiányzik a telepítő könyvtárából. Kérem hárítsa el a problémát, vagy szerezzen be egy másik példányt a programból!
+SetupFileCorrupt=A telepítési fájlok sérültek. Kérem, szerezzen be új másolatot a programból!
+SetupFileCorruptOrWrongVer=A telepítési fájlok sérültek, vagy inkompatibilisek a telepítő ezen verziójával. Hárítsa el a problémát, vagy szerezzen be egy másik példányt a programból!
+InvalidParameter=A parancssorba átadott paraméter érvénytelen:%n%n%1
+SetupAlreadyRunning=A Telepítő már fut.
+WindowsVersionNotSupported=A program nem támogatja a Windows ezen verzióját.
+WindowsServicePackRequired=A program futtatásához %1 Service Pack %2 vagy újabb szükséges.
+NotOnThisPlatform=Ez a program nem futtatható %1 alatt.
+OnlyOnThisPlatform=Ezt a programot %1 alatt kell futtatni.
+OnlyOnTheseArchitectures=A program kizárólag a következő processzor architektúrákhoz tervezett Windows-on telepíthető:%n%n%1
+WinVersionTooLowError=A program futtatásához %1 %2 verziója vagy későbbi szükséges.
+WinVersionTooHighError=Ez a program nem telepíthető %1 %2 vagy későbbire.
+AdminPrivilegesRequired=Csak rendszergazdai módban telepíthető ez a program.
+PowerUserPrivilegesRequired=Csak rendszergazdaként vagy kiemelt felhasználóként telepíthető ez a program.
+SetupAppRunningError=A telepítő úgy észlelte %1 jelenleg fut.%n%nZárja be az összes példányt, majd kattintson az 'OK'-ra a folytatáshoz, vagy a 'Mégse'-re a kilépéshez.
+UninstallAppRunningError=Az eltávolító úgy észlelte %1 jelenleg fut.%n%nZárja be az összes példányt, majd kattintson az 'OK'-ra a folytatáshoz, vagy a 'Mégse'-re a kilépéshez.
+
+; *** Startup questions
+PrivilegesRequiredOverrideTitle=Telepítési mód kiválasztása
+PrivilegesRequiredOverrideInstruction=Válasszon telepítési módot
+PrivilegesRequiredOverrideText1=%1 telepíthető az összes felhasználónak (rendszergazdai jogok szükségesek), vagy csak magának.
+PrivilegesRequiredOverrideText2=%1 csak magának telepíthető, vagy az összes felhasználónak (rendszergazdai jogok szükségesek).
+PrivilegesRequiredOverrideAllUsers=Telepítés &mindenkinek
+PrivilegesRequiredOverrideAllUsersRecommended=Telepítés &mindenkinek (ajánlott)
+PrivilegesRequiredOverrideCurrentUser=Telepítés csak &nekem
+PrivilegesRequiredOverrideCurrentUserRecommended=Telepítés csak &nekem (ajánlott)
+
+; *** Misc. errors
+ErrorCreatingDir=A Telepítő nem tudta létrehozni a(z) "%1" könyvtárat
+ErrorTooManyFilesInDir=Nem hozható létre fájl a(z) "%1" könyvtárban, mert az már túl sok fájlt tartalmaz
+
+; *** Setup common messages
+ExitSetupTitle=Kilépés a telepítőből
+ExitSetupMessage=A telepítés még folyamatban van. Ha most kilép, a program nem kerül telepítésre.%n%nMásik alkalommal is futtatható a telepítés befejezéséhez%n%nKilép a telepítőből?
+AboutSetupMenuItem=&Névjegy...
+AboutSetupTitle=Telepítő névjegye
+AboutSetupMessage=%1 %2 verzió%n%3%n%nAz %1 honlapja:%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< &Vissza
+ButtonNext=&Tovább >
+ButtonInstall=&Telepít
+ButtonOK=OK
+ButtonCancel=Mégse
+ButtonYes=&Igen
+ButtonYesToAll=&Mindet
+ButtonNo=&Nem
+ButtonNoToAll=&Egyiket se
+ButtonFinish=&Befejezés
+ButtonBrowse=&Tallózás...
+ButtonWizardBrowse=T&allózás...
+ButtonNewFolder=Új &könyvtár
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Telepítő nyelvi beállítás
+SelectLanguageLabel=Válassza ki a telepítés alatt használt nyelvet.
+
+; *** Common wizard text
+ClickNext=A folytatáshoz kattintson a 'Tovább'-ra, a kilépéshez a 'Mégse'-re.
+BeveledLabel=
+BrowseDialogTitle=Válasszon könyvtárt 
+BrowseDialogLabel=Válasszon egy könyvtárat az alábbi listából, majd kattintson az 'OK'-ra.
+NewFolderName=Új könyvtár
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Üdvözli a(z) [name] Telepítővarázslója.
+WelcomeLabel2=A(z) [name/ver] telepítésre kerül a számítógépén.%n%nAjánlott minden, egyéb futó alkalmazás bezárása a folytatás előtt.
+
+; *** "Password" wizard page
+WizardPassword=Jelszó
+PasswordLabel1=Ez a telepítés jelszóval védett.
+PasswordLabel3=Kérem adja meg a jelszót, majd kattintson a 'Tovább'-ra. A jelszavak kis- és nagy betű érzékenyek lehetnek.
+PasswordEditLabel=&Jelszó:
+IncorrectPassword=Az ön által megadott jelszó helytelen. Próbálja újra.
+
+; *** "License Agreement" wizard page
+WizardLicense=Licencszerződés
+LicenseLabel=Olvassa el figyelmesen az információkat folytatás előtt.
+LicenseLabel3=Kérem, olvassa el az alábbi licencszerződést. A telepítés folytatásához, el kell fogadnia a szerződést.
+LicenseAccepted=&Elfogadom a szerződést
+LicenseNotAccepted=&Nem fogadom el a szerződést
+
+; *** "Information" wizard pages
+WizardInfoBefore=Információk
+InfoBeforeLabel=Olvassa el a következő fontos információkat a folytatás előtt.
+InfoBeforeClickLabel=Ha készen áll, kattintson a 'Tovább'-ra.
+WizardInfoAfter=Információk
+InfoAfterLabel=Olvassa el a következő fontos információkat a folytatás előtt.
+InfoAfterClickLabel=Ha készen áll, kattintson a 'Tovább'-ra.
+
+; *** "User Information" wizard page
+WizardUserInfo=Felhasználó adatai
+UserInfoDesc=Kérem, adja meg az adatait
+UserInfoName=&Felhasználónév:
+UserInfoOrg=&Szervezet:
+UserInfoSerial=&Sorozatszám:
+UserInfoNameRequired=Meg kell adnia egy nevet.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Válasszon célkönyvtárat
+SelectDirDesc=Hova települjön a(z) [name]?
+SelectDirLabel3=A(z) [name] az alábbi könyvtárba lesz telepítve. 
+SelectDirBrowseLabel=A folytatáshoz, kattintson a 'Tovább'-ra. Ha másik könyvtárat választana, kattintson a 'Tallózás'-ra.
+DiskSpaceGBLabel=At least [gb] GB szabad területre van szükség.
+DiskSpaceMBLabel=Legalább [mb] MB szabad területre van szükség.
+CannotInstallToNetworkDrive=A Telepítő nem tud hálózati meghajtóra telepíteni.
+CannotInstallToUNCPath=A Telepítő nem tud hálózati UNC elérési útra telepíteni.
+InvalidPath=Teljes útvonalat adjon meg, a meghajtó betűjelével; például:%n%nC:\Alkalmazás%n%nvagy egy hálózati útvonalat a következő alakban:%n%n\\kiszolgáló\megosztás
+InvalidDrive=A kiválasztott meghajtó vagy hálózati megosztás nem létezik vagy nem elérhető. Válasszon egy másikat.
+DiskSpaceWarningTitle=Nincs elég szabad terület
+DiskSpaceWarning=A Telepítőnek legalább %1 KB szabad lemezterületre van szüksége, viszont a kiválasztott meghajtón csupán %2 KB áll rendelkezésre.%n%nMindenképpen folytatja?
+DirNameTooLong=A könyvtár neve vagy az útvonal túl hosszú.
+InvalidDirName=A könyvtár neve érvénytelen.
+BadDirName32=A könyvtárak nevei ezen karakterek egyikét sem tartalmazhatják:%n%n%1
+DirExistsTitle=A könyvtár már létezik
+DirExists=A könyvtár:%n%n%1%n%nmár létezik. Mindenképp ide akar telepíteni?
+DirDoesntExistTitle=A könyvtár nem létezik
+DirDoesntExist=A könyvtár:%n%n%1%n%nnem létezik. Szeretné létrehozni?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Összetevők kiválasztása
+SelectComponentsDesc=Mely összetevők kerüljenek telepítésre?
+SelectComponentsLabel2=Jelölje ki a telepítendő összetevőket; törölje a telepíteni nem kívánt összetevőket. Kattintson a 'Tovább'-ra, ha készen áll a folytatásra.
+FullInstallation=Teljes telepítés
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Szokásos telepítés
+CustomInstallation=Egyéni telepítés
+NoUninstallWarningTitle=Létező összetevő
+NoUninstallWarning=A telepítő úgy találta, hogy a következő összetevők már telepítve vannak a számítógépre:%n%n%1%n%nEzen összetevők kijelölésének törlése, nem távolítja el azokat a számítógépről.%n%nMindenképpen folytatja?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=A jelenlegi kijelölés legalább [gb] GB lemezterületet igényel.
+ComponentsDiskSpaceMBLabel=A jelenlegi kijelölés legalább [mb] MB lemezterületet igényel.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=További feladatok
+SelectTasksDesc=Mely kiegészítő feladatok kerüljenek végrehajtásra?
+SelectTasksLabel2=Jelölje ki, mely kiegészítő feladatokat hajtsa végre a Telepítő a(z) [name] telepítése során, majd kattintson a 'Tovább'-ra.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Start Menü könyvtára
+SelectStartMenuFolderDesc=Hova helyezze a Telepítő a program parancsikonjait?
+SelectStartMenuFolderLabel3=A Telepítő a program parancsikonjait a Start menü következő mappájában fogja létrehozni.
+SelectStartMenuFolderBrowseLabel=A folytatáshoz kattintson a 'Tovább'-ra. Ha másik mappát választana, kattintson a 'Tallózás'-ra.
+MustEnterGroupName=Meg kell adnia egy mappanevet.
+GroupNameTooLong=A könyvtár neve vagy az útvonal túl hosszú.
+InvalidGroupName=A könyvtár neve érvénytelen.
+BadGroupName=A könyvtárak nevei ezen karakterek egyikét sem tartalmazhatják:%n%n%1
+NoProgramGroupCheck2=&Ne hozzon létre mappát a Start menüben
+
+; *** "Ready to Install" wizard page
+WizardReady=Készen állunk a telepítésre
+ReadyLabel1=A Telepítő készen áll, a(z) [name] számítógépre telepítéshez.
+ReadyLabel2a=Kattintson a 'Telepítés'-re a folytatáshoz, vagy a "Vissza"-ra a beállítások áttekintéséhez vagy megváltoztatásához.
+ReadyLabel2b=Kattintson a 'Telepítés'-re a folytatáshoz.
+ReadyMemoUserInfo=Felhasználó adatai:
+ReadyMemoDir=Telepítés célkönyvtára:
+ReadyMemoType=Telepítés típusa:
+ReadyMemoComponents=Választott összetevők:
+ReadyMemoGroup=Start menü mappája:
+ReadyMemoTasks=Kiegészítő feladatok:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Felkészülés a telepítésre
+PreparingDesc=A Telepítő felkészül a(z) [name] számítógépre történő telepítéshez.
+PreviousInstallNotCompleted=gy korábbi program telepítése/eltávolítása nem fejeződött be. Újra kell indítania a számítógépét a másik telepítés befejezéséhez.%n%nA számítógépe újraindítása után ismét futtassa a Telepítőt a(z) [name] telepítésének befejezéséhez.
+CannotContinue=A telepítés nem folytatható. A kilépéshez kattintson a 'Mégse'-re
+ApplicationsFound=A következő alkalmazások olyan fájlokat használnak, amelyeket a Telepítőnek frissíteni kell. Ajánlott, hogy engedélyezze a Telepítőnek ezen alkalmazások automatikus bezárását.
+ApplicationsFound2=A következő alkalmazások olyan fájlokat használnak, amelyeket a Telepítőnek frissíteni kell. Ajánlott, hogy engedélyezze a Telepítőnek ezen alkalmazások automatikus bezárását. A telepítés befejezése után a Telepítő megkísérli az alkalmazások újraindítását.
+CloseApplications=&Alkalmazások automatikus bezárása
+DontCloseApplications=&Ne zárja be az alkalmazásokat
+ErrorCloseApplications=A Telepítő nem tudott minden alkalmazást automatikusan bezárni. A folytatás előtt ajánlott minden, a Telepítő által frissítendő fájlokat használó alkalmazást bezárni.
+PrepareToInstallNeedsRestart=A telepítőnek újra kell indítania a számítógépet. Újraindítást követően, futtassa újból a telepítőt, a [name] telepítésének befejezéséhez .%n%nÚjra szeretné indítani most a számítógépet?
+
+; *** "Installing" wizard page
+WizardInstalling=Telepítés
+InstallingLabel=Kérem várjon, amíg a(z) [name] telepítése zajlik.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=A(z) [name] telepítésének befejezése
+FinishedLabelNoIcons=A Telepítő végzett a(z) [name] telepítésével.
+FinishedLabel=A Telepítő végzett a(z) [name] telepítésével. Az alkalmazást a létrehozott ikonok kiválasztásával indíthatja.
+ClickFinish=Kattintson a 'Befejezés'-re a kilépéshez.
+FinishedRestartLabel=A(z) [name] telepítésének befejezéséhez újra kell indítani a számítógépet. Újraindítja most?
+FinishedRestartMessage=A(z) [name] telepítésének befejezéséhez, a Telepítőnek újra kell indítani a számítógépet.%n%nÚjraindítja most?
+ShowReadmeCheck=Igen, szeretném elolvasni a FONTOS fájlt
+YesRadio=&Igen, újraindítás most
+NoRadio=&Nem, később indítom újra
+; used for example as 'Run MyProg.exe'
+RunEntryExec=%1 futtatása
+; used for example as 'View Readme.txt'
+RunEntryShellExec=%1 megtekintése
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=A Telepítőnek szüksége van a következő lemezre
+SelectDiskLabel2=Helyezze be a(z) %1. lemezt és kattintson az 'OK'-ra.%n%nHa a fájlok a lemez egy a megjelenítettől különböző mappájában találhatók, írja be a helyes útvonalat vagy kattintson a 'Tallózás'-ra.
+PathLabel=Ú&tvonal:
+FileNotInDir2=A(z) "%1" fájl nem található a következő helyen: "%2". Helyezze be a megfelelő lemezt vagy válasszon egy másik mappát.
+SelectDirectoryLabel=Adja meg a következő lemez helyét.
+
+; *** Installation phase messages
+SetupAborted=A telepítés nem fejeződött be.%n%nHárítsa el a hibát és futtassa újból a Telepítőt.
+AbortRetryIgnoreSelectAction=Válasszon műveletet
+AbortRetryIgnoreRetry=&Újra
+AbortRetryIgnoreIgnore=&Hiba elvetése és folytatás
+AbortRetryIgnoreCancel=Telepítés megszakítása
+
+; *** Installation status messages
+StatusClosingApplications=Alkalmazások bezárása...
+StatusCreateDirs=Könyvtárak létrehozása...
+StatusExtractFiles=Fájlok kibontása...
+StatusCreateIcons=Parancsikonok létrehozása...
+StatusCreateIniEntries=INI bejegyzések létrehozása...
+StatusCreateRegistryEntries=Rendszerleíró bejegyzések létrehozása...
+StatusRegisterFiles=Fájlok regisztrálása...
+StatusSavingUninstall=Eltávolító információk mentése...
+StatusRunProgram=Telepítés befejezése...
+StatusRestartingApplications=Alkalmazások újraindítása...
+StatusRollback=Változtatások visszavonása...
+
+; *** Misc. errors
+ErrorInternal2=Belső hiba: %1
+ErrorFunctionFailedNoCode=Sikertelen %1
+ErrorFunctionFailed=Sikertelen %1; kód: %2
+ErrorFunctionFailedWithMessage=Sikertelen %1; kód: %2.%n%3
+ErrorExecutingProgram=Nem hajtható végre a fájl:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Nem nyitható meg a rendszerleíró kulcs:%n%1\%2
+ErrorRegCreateKey=Nem hozható létre a rendszerleíró kulcs:%n%1\%2
+ErrorRegWriteKey=Nem módosítható a rendszerleíró kulcs:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Bejegyzés létrehozása sikertelen a következő INI fájlban: "%1".
+
+; *** File copying errors
+FileAbortRetryIgnoreSkipNotRecommended=&Fájl kihagyása (nem ajánlott)
+FileAbortRetryIgnoreIgnoreNotRecommended=&Hiba elvetése és folytatás (nem ajánlott)
+SourceIsCorrupted=A forrásfájl megsérült
+SourceDoesntExist=A(z) "%1" forrásfájl nem létezik
+ExistingFileReadOnly2=A fájl csak olvashatóként van jelölve.
+ExistingFileReadOnlyRetry=Csak &olvasható tulajdonság eltávolítása és újra próbálkozás 
+ExistingFileReadOnlyKeepExisting=&Létező fájl megtartása
+ErrorReadingExistingDest=Hiba lépett fel a fájl olvasása közben:
+FileExists=A fájl már létezik.%n%nFelül kívánja írni?
+ExistingFileNewer=A létező fájl újabb a telepítésre kerülőnél. Ajánlott a létező fájl megtartása.%n%nMeg kívánja tartani a létező fájlt?
+ErrorChangingAttr=Hiba lépett fel a fájl attribútumának módosítása közben:
+ErrorCreatingTemp=Hiba lépett fel a fájl telepítési könyvtárban történő létrehozása közben:
+ErrorReadingSource=Hiba lépett fel a forrásfájl olvasása közben:
+ErrorCopying=Hiba lépett fel a fájl másolása közben:
+ErrorReplacingExistingFile=Hiba lépett fel a létező fájl cseréje közben:
+ErrorRestartReplace=A fájl cseréje az újraindítás után sikertelen volt:
+ErrorRenamingTemp=Hiba lépett fel fájl telepítési könyvtárban történő átnevezése közben:
+ErrorRegisterServer=Nem lehet regisztrálni a DLL-t/OCX-et: %1
+ErrorRegSvr32Failed=Sikertelen RegSvr32. A visszaadott kód: %1
+ErrorRegisterTypeLib=Nem lehet regisztrálni a típustárat: %1
+
+; *** Uninstall display name markings
+; used for example as 'My Program (32-bit)'
+UninstallDisplayNameMark=%1 (%2)
+; used for example as 'My Program (32-bit, All users)'
+UninstallDisplayNameMarks=%1 (%2, %3)
+UninstallDisplayNameMark32Bit=32-bit
+UninstallDisplayNameMark64Bit=64-bit
+UninstallDisplayNameMarkAllUsers=Minden felhasználó
+UninstallDisplayNameMarkCurrentUser=Jelenlegi felhasználó
+
+; *** Post-installation errors
+ErrorOpeningReadme=Hiba lépett fel a FONTOS fájl megnyitása közben.
+ErrorRestartingComputer=A Telepítő nem tudta újraindítani a számítógépet. Indítsa újra kézileg.
+
+; *** Uninstaller messages
+UninstallNotFound=A(z) "%1" fájl nem létezik. Nem távolítható el.
+UninstallOpenError=A(z) "%1" fájl nem nyitható meg. Nem távolítható el.
+UninstallUnsupportedVer=A(z) "%1" eltávolítási naplófájl formátumát nem tudja felismerni az eltávolító jelen verziója. Az eltávolítás nem folytatható
+UninstallUnknownEntry=Egy ismeretlen bejegyzés (%1) található az eltávolítási naplófájlban
+ConfirmUninstall=Biztosan el kívánja távolítani a(z) %1 programot és minden összetevőjét?
+UninstallOnlyOnWin64=Ezt a telepítést csak 64-bites Windowson lehet eltávolítani.
+OnlyAdminCanUninstall=Ezt a telepítést csak adminisztrációs jogokkal rendelkező felhasználó távolíthatja el.
+UninstallStatusLabel=Legyen türelemmel, amíg a(z) %1 számítógépéről történő eltávolítása befejeződik.
+UninstalledAll=A(z) %1 sikeresen el lett távolítva a számítógépről.
+UninstalledMost=A(z) %1 eltávolítása befejeződött.%n%nNéhány elemet nem lehetett eltávolítani. Törölje kézileg.
+UninstalledAndNeedsRestart=A(z) %1 eltávolításának befejezéséhez újra kell indítania a számítógépét.%n%nÚjraindítja most?
+UninstallDataCorrupted=A(z) "%1" fájl sérült. Nem távolítható el.
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Törli a megosztott fájlt?
+ConfirmDeleteSharedFile2=A rendszer azt jelzi, hogy a következő megosztott fájlra már nincs szüksége egyetlen programnak sem. Eltávolítja a megosztott fájlt?%n%nHa más programok még mindig használják a megosztott fájlt, akkor az eltávolítása után lehet, hogy nem fognak megfelelően működni. Ha bizonytalan, válassza a Nemet. A fájl megtartása nem okoz problémát a rendszerben.
+SharedFileNameLabel=Fájlnév:
+SharedFileLocationLabel=Helye:
+WizardUninstalling=Eltávolítás állapota
+StatusUninstalling=%1 eltávolítása...
+
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=%1 telepítése.
+ShutdownBlockReasonUninstallingApp=%1 eltávolítása.
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1, verzió: %2
+AdditionalIcons=További parancsikonok:
+CreateDesktopIcon=&Asztali ikon létrehozása
+CreateQuickLaunchIcon=&Gyorsindító parancsikon létrehozása
+ProgramOnTheWeb=%1 az interneten
+UninstallProgram=Eltávolítás - %1
+LaunchProgram=Indítás %1
+AssocFileExtension=A(z) %1 &társítása a(z) %2 fájlkiterjesztéssel
+AssocingFileExtension=A(z) %1 társítása a(z) %2 fájlkiterjesztéssel...
+AutoStartProgramGroupDescription=Indítópult:
+AutoStartProgram=%1 automatikus indítása
+AddonHostProgramNotFound=A(z) %1 nem található a kiválasztott könyvtárban.%n%nMindenképpen folytatja?

build/win32/i18n/Default.isl

@@ -1,336 +0,0 @@
-; *** Inno Setup version 5.5.3+ English messages ***
-;
-; To download user-contributed translations of this file, go to:
-;   http://www.jrsoftware.org/files/istrans/
-;
-; Note: When translating this text, do not add periods (.) to the end of
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
-
-[LangOptions]
-; 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
-LanguageCodePage=0
-; If the language you are translating to requires special font faces or
-; sizes, uncomment any of the following entries and change them accordingly.
-;DialogFontName=
-;DialogFontSize=8
-;WelcomeFontName=Verdana
-;WelcomeFontSize=12
-;TitleFontName=Arial
-;TitleFontSize=29
-;CopyrightFontName=Arial
-;CopyrightFontSize=8
-
-[Messages]
-
-; *** Application titles
-SetupAppTitle=Setup
-SetupWindowTitle=Setup - %1
-UninstallAppTitle=Uninstall
-UninstallAppFullTitle=%1 Uninstall
-
-; *** Misc. common
-InformationTitle=Information
-ConfirmTitle=Confirm
-ErrorTitle=Error
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=This will install %1. Do you wish to continue?
-LdrCannotCreateTemp=Unable to create a temporary file. Setup aborted
-LdrCannotExecTemp=Unable to execute file in the temporary directory. Setup aborted
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%nError %2: %3
-SetupFileMissing=The file %1 is missing from the installation directory. Please correct the problem or obtain a new copy of the program.
-SetupFileCorrupt=The setup files are corrupted. Please obtain a new copy of the program.
-SetupFileCorruptOrWrongVer=The setup files are corrupted, or are incompatible with this version of Setup. Please correct the problem or obtain a new copy of the program.
-InvalidParameter=An invalid parameter was passed on the command line:%n%n%1
-SetupAlreadyRunning=Setup is already running.
-WindowsVersionNotSupported=This program does not support the version of Windows your computer is running.
-WindowsServicePackRequired=This program requires %1 Service Pack %2 or later.
-NotOnThisPlatform=This program will not run on %1.
-OnlyOnThisPlatform=This program must be run on %1.
-OnlyOnTheseArchitectures=This program can only be installed on versions of Windows designed for the following processor architectures:%n%n%1
-MissingWOW64APIs=The version of Windows you are running does not include functionality required by Setup to perform a 64-bit installation. To correct this problem, please install Service Pack %1.
-WinVersionTooLowError=This program requires %1 version %2 or later.
-WinVersionTooHighError=This program cannot be installed on %1 version %2 or later.
-AdminPrivilegesRequired=You must be logged in as an administrator when installing this program.
-PowerUserPrivilegesRequired=You must be logged in as an administrator or as a member of the Power Users group when installing this program.
-SetupAppRunningError=Setup has detected that %1 is currently running.%n%nPlease close all instances of it now, then click OK to continue, or Cancel to exit.
-UninstallAppRunningError=Uninstall has detected that %1 is currently running.%n%nPlease close all instances of it now, then click OK to continue, or Cancel to exit.
-
-; *** Misc. errors
-ErrorCreatingDir=Setup was unable to create the directory "%1"
-ErrorTooManyFilesInDir=Unable to create a file in the directory "%1" because it contains too many files
-
-; *** Setup common messages
-ExitSetupTitle=Exit Setup
-ExitSetupMessage=Setup is not complete. If you exit now, the program will not be installed.%n%nYou may run Setup again at another time to complete the installation.%n%nExit Setup?
-AboutSetupMenuItem=&About Setup...
-AboutSetupTitle=About Setup
-AboutSetupMessage=%1 version %2%n%3%n%n%1 home page:%n%4
-AboutSetupNote=
-TranslatorNote=
-
-; *** Buttons
-ButtonBack=< &Back
-ButtonNext=&Next >
-ButtonInstall=&Install
-ButtonOK=OK
-ButtonCancel=Cancel
-ButtonYes=&Yes
-ButtonYesToAll=Yes to &All
-ButtonNo=&No
-ButtonNoToAll=N&o to All
-ButtonFinish=&Finish
-ButtonBrowse=&Browse...
-ButtonWizardBrowse=B&rowse...
-ButtonNewFolder=&Make New Folder
-
-; *** "Select Language" dialog messages
-SelectLanguageTitle=Select Setup Language
-SelectLanguageLabel=Select the language to use during the installation:
-
-; *** Common wizard text
-ClickNext=Click Next to continue, or Cancel to exit Setup.
-BeveledLabel=
-BrowseDialogTitle=Browse For Folder
-BrowseDialogLabel=Select a folder in the list below, then click OK.
-NewFolderName=New Folder
-
-; *** "Welcome" wizard page
-WelcomeLabel1=Welcome to the [name] Setup Wizard
-WelcomeLabel2=This will install [name/ver] on your computer.%n%nIt is recommended that you close all other applications before continuing.
-
-; *** "Password" wizard page
-WizardPassword=Password
-PasswordLabel1=This installation is password protected.
-PasswordLabel3=Please provide the password, then click Next to continue. Passwords are case-sensitive.
-PasswordEditLabel=&Password:
-IncorrectPassword=The password you entered is not correct. Please try again.
-
-; *** "License Agreement" wizard page
-WizardLicense=License Agreement
-LicenseLabel=Please read the following important information before continuing.
-LicenseLabel3=Please read the following License Agreement. You must accept the terms of this agreement before continuing with the installation.
-LicenseAccepted=I &accept the agreement
-LicenseNotAccepted=I &do not accept the agreement
-
-; *** "Information" wizard pages
-WizardInfoBefore=Information
-InfoBeforeLabel=Please read the following important information before continuing.
-InfoBeforeClickLabel=When you are ready to continue with Setup, click Next.
-WizardInfoAfter=Information
-InfoAfterLabel=Please read the following important information before continuing.
-InfoAfterClickLabel=When you are ready to continue with Setup, click Next.
-
-; *** "User Information" wizard page
-WizardUserInfo=User Information
-UserInfoDesc=Please enter your information.
-UserInfoName=&User Name:
-UserInfoOrg=&Organization:
-UserInfoSerial=&Serial Number:
-UserInfoNameRequired=You must enter a name.
-
-; *** "Select Destination Location" wizard page
-WizardSelectDir=Select Destination Location
-SelectDirDesc=Where should [name] be installed?
-SelectDirLabel3=Setup will install [name] into the following folder.
-SelectDirBrowseLabel=To continue, click Next. If you would like to select a different folder, click Browse.
-DiskSpaceMBLabel=At least [mb] MB of free disk space is required.
-CannotInstallToNetworkDrive=Setup cannot install to a network drive.
-CannotInstallToUNCPath=Setup cannot install to a UNC path.
-InvalidPath=You must enter a full path with drive letter; for example:%n%nC:\APP%n%nor a UNC path in the form:%n%n\\server\share
-InvalidDrive=The drive or UNC share you selected does not exist or is not accessible. Please select another.
-DiskSpaceWarningTitle=Not Enough Disk Space
-DiskSpaceWarning=Setup requires at least %1 KB of free space to install, but the selected drive only has %2 KB available.%n%nDo you want to continue anyway?
-DirNameTooLong=The folder name or path is too long.
-InvalidDirName=The folder name is not valid.
-BadDirName32=Folder names cannot include any of the following characters:%n%n%1
-DirExistsTitle=Folder Exists
-DirExists=The folder:%n%n%1%n%nalready exists. Would you like to install to that folder anyway?
-DirDoesntExistTitle=Folder Does Not Exist
-DirDoesntExist=The folder:%n%n%1%n%ndoes not exist. Would you like the folder to be created?
-
-; *** "Select Components" wizard page
-WizardSelectComponents=Select Components
-SelectComponentsDesc=Which components should be installed?
-SelectComponentsLabel2=Select the components you want to install; clear the components you do not want to install. Click Next when you are ready to continue.
-FullInstallation=Full installation
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=Compact installation
-CustomInstallation=Custom installation
-NoUninstallWarningTitle=Components Exist
-NoUninstallWarning=Setup has detected that the following components are already installed on your computer:%n%n%1%n%nDeselecting these components will not uninstall them.%n%nWould you like to continue anyway?
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=Current selection requires at least [mb] MB of disk space.
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=Select Additional Tasks
-SelectTasksDesc=Which additional tasks should be performed?
-SelectTasksLabel2=Select the additional tasks you would like Setup to perform while installing [name], then click Next.
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=Select Start Menu Folder
-SelectStartMenuFolderDesc=Where should Setup place the program's shortcuts?
-SelectStartMenuFolderLabel3=Setup will create the program's shortcuts in the following Start Menu folder.
-SelectStartMenuFolderBrowseLabel=To continue, click Next. If you would like to select a different folder, click Browse.
-MustEnterGroupName=You must enter a folder name.
-GroupNameTooLong=The folder name or path is too long.
-InvalidGroupName=The folder name is not valid.
-BadGroupName=The folder name cannot include any of the following characters:%n%n%1
-NoProgramGroupCheck2=&Don't create a Start Menu folder
-
-; *** "Ready to Install" wizard page
-WizardReady=Ready to Install
-ReadyLabel1=Setup is now ready to begin installing [name] on your computer.
-ReadyLabel2a=Click Install to continue with the installation, or click Back if you want to review or change any settings.
-ReadyLabel2b=Click Install to continue with the installation.
-ReadyMemoUserInfo=User information:
-ReadyMemoDir=Destination location:
-ReadyMemoType=Setup type:
-ReadyMemoComponents=Selected components:
-ReadyMemoGroup=Start Menu folder:
-ReadyMemoTasks=Additional tasks:
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=Preparing to Install
-PreparingDesc=Setup is preparing to install [name] on your computer.
-PreviousInstallNotCompleted=The installation/removal of a previous program was not completed. You will need to restart your computer to complete that installation.%n%nAfter restarting your computer, run Setup again to complete the installation of [name].
-CannotContinue=Setup cannot continue. Please click Cancel to exit.
-ApplicationsFound=The following applications are using files that need to be updated by Setup. It is recommended that you allow Setup to automatically close these applications.
-ApplicationsFound2=The following applications are using files that need to be updated by Setup. It is recommended that you allow Setup to automatically close these applications. After the installation has completed, Setup will attempt to restart the applications.
-CloseApplications=&Automatically close the applications
-DontCloseApplications=&Do not close the applications
-ErrorCloseApplications=Setup was unable to automatically close all applications. It is recommended that you close all applications using files that need to be updated by Setup before continuing.
-
-; *** "Installing" wizard page
-WizardInstalling=Installing
-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 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?
-ShowReadmeCheck=Yes, I would like to view the README file
-YesRadio=&Yes, restart the computer now
-NoRadio=&No, I will restart the computer later
-; used for example as 'Run MyProg.exe'
-RunEntryExec=Run %1
-; used for example as 'View Readme.txt'
-RunEntryShellExec=View %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=Setup Needs the Next Disk
-SelectDiskLabel2=Please insert Disk %1 and click OK.%n%nIf the files on this disk can be found in a folder other than the one displayed below, enter the correct path or click Browse.
-PathLabel=&Path:
-FileNotInDir2=The file "%1" could not be located in "%2". Please insert the correct disk or select another folder.
-SelectDirectoryLabel=Please specify the location of the next disk.
-
-; *** Installation phase messages
-SetupAborted=Setup was not completed.%n%nPlease correct the problem and run Setup again.
-EntryAbortRetryIgnore=Click Retry to try again, Ignore to proceed anyway, or Abort to cancel installation.
-
-; *** Installation status messages
-StatusClosingApplications=Closing applications...
-StatusCreateDirs=Creating directories...
-StatusExtractFiles=Extracting files...
-StatusCreateIcons=Creating shortcuts...
-StatusCreateIniEntries=Creating INI entries...
-StatusCreateRegistryEntries=Creating registry entries...
-StatusRegisterFiles=Registering files...
-StatusSavingUninstall=Saving uninstall information...
-StatusRunProgram=Finishing installation...
-StatusRestartingApplications=Restarting applications...
-StatusRollback=Rolling back changes...
-
-; *** Misc. errors
-ErrorInternal2=Internal error: %1
-ErrorFunctionFailedNoCode=%1 failed
-ErrorFunctionFailed=%1 failed; code %2
-ErrorFunctionFailedWithMessage=%1 failed; code %2.%n%3
-ErrorExecutingProgram=Unable to execute file:%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=Error opening registry key:%n%1\%2
-ErrorRegCreateKey=Error creating registry key:%n%1\%2
-ErrorRegWriteKey=Error writing to registry key:%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=Error creating INI entry in file "%1".
-
-; *** File copying errors
-FileAbortRetryIgnore=Click Retry to try again, Ignore to skip this file (not recommended), or Abort to cancel installation.
-FileAbortRetryIgnore2=Click Retry to try again, Ignore to proceed anyway (not recommended), or Abort to cancel installation.
-SourceIsCorrupted=The source file is corrupted
-SourceDoesntExist=The source file "%1" does not exist
-ExistingFileReadOnly=The existing file is marked as read-only.%n%nClick Retry to remove the read-only attribute and try again, Ignore to skip this file, or Abort to cancel installation.
-ErrorReadingExistingDest=An error occurred while trying to read the existing file:
-FileExists=The file already exists.%n%nWould you like Setup to overwrite it?
-ExistingFileNewer=The existing file is newer than the one Setup is trying to install. It is recommended that you keep the existing file.%n%nDo you want to keep the existing file?
-ErrorChangingAttr=An error occurred while trying to change the attributes of the existing file:
-ErrorCreatingTemp=An error occurred while trying to create a file in the destination directory:
-ErrorReadingSource=An error occurred while trying to read the source file:
-ErrorCopying=An error occurred while trying to copy a file:
-ErrorReplacingExistingFile=An error occurred while trying to replace the existing file:
-ErrorRestartReplace=RestartReplace failed:
-ErrorRenamingTemp=An error occurred while trying to rename a file in the destination directory:
-ErrorRegisterServer=Unable to register the DLL/OCX: %1
-ErrorRegSvr32Failed=RegSvr32 failed with exit code %1
-ErrorRegisterTypeLib=Unable to register the type library: %1
-
-; *** Post-installation errors
-ErrorOpeningReadme=An error occurred while trying to open the README file.
-ErrorRestartingComputer=Setup was unable to restart the computer. Please do this manually.
-
-; *** Uninstaller messages
-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? 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.
-UninstalledAll=%1 was successfully removed from your computer.
-UninstalledMost=%1 uninstall complete.%n%nSome elements could not be removed. These can be removed manually.
-UninstalledAndNeedsRestart=To complete the uninstallation of %1, your computer must be restarted.%n%nWould you like to restart now?
-UninstallDataCorrupted="%1" file is corrupted. Cannot uninstall
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=Remove Shared File?
-ConfirmDeleteSharedFile2=The system indicates that the following shared file is no longer in use by any programs. Would you like for Uninstall to remove this shared file?%n%nIf any programs are still using this file and it is removed, those programs may not function properly. If you are unsure, choose No. Leaving the file on your system will not cause any harm.
-SharedFileNameLabel=File name:
-SharedFileLocationLabel=Location:
-WizardUninstalling=Uninstall Status
-StatusUninstalling=Uninstalling %1...
-
-; *** Shutdown block reasons
-ShutdownBlockReasonInstallingApp=Installing %1.
-ShutdownBlockReasonUninstallingApp=Uninstalling %1.
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 version %2
-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
-AssocFileExtension=&Associate %1 with the %2 file extension
-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?

build/win32/i18n/Default.ko.isl

@@ -1,12 +1,16 @@
-; *** Inno Setup version 5.5.3+ Korean messages ***
+; *** Inno Setup version 6.0.0+ Korean messages ***
-;
-; To download user-contributed translations of this file, go to:
-;   http://www.jrsoftware.org/files/istrans/
 ;
+; ▒ 6.0.3+ Translator: SungDong Kim (acroedit@gmail.com)
+; ▒ 5.5.3+ Translator: Domddol (domddol@gmail.com)
+; ▒ Translation date: MAR 04, 2014
+; ▒ Contributors: Hansoo KIM (iryna7@gmail.com), Woong-Jae An (a183393@hanmail.net)
+; ▒ Storage: http://www.jrsoftware.org/files/istrans/
+; ▒ 이 번역은 새로운 한국어 맞춤법 규칙을 준수합니다.
 ; Note: When translating this text, do not add periods (.) to the end of
 ; messages that didn't have them already, because on those messages Inno
 ; Setup adds the periods automatically (appending a period would result in
 ; two periods being displayed).
+
 [LangOptions]
 ; The following three entries are very important. Be sure to read and 
 ; understand the '[LangOptions] section' topic in the help file.
@@ -23,50 +27,68 @@ LanguageCodePage=949
 ;TitleFontSize=29
 ;CopyrightFontName=Arial
 ;CopyrightFontSize=8
+
 [Messages]
+
 ; *** Application titles
 SetupAppTitle=설치
-SetupWindowTitle=설치 - %1
+SetupWindowTitle=%1 설치
 UninstallAppTitle=제거
 UninstallAppFullTitle=%1 제거
+
 ; *** Misc. common
 InformationTitle=정보
 ConfirmTitle=확인
 ErrorTitle=오류
+
 ; *** SetupLdr messages
-SetupLdrStartupMessage=그러면 %1이(가) 설치됩니다. 계속하시겠습니까?
+SetupLdrStartupMessage=%1을(를) 설치합니다, 계속하시겠습니까?
-LdrCannotCreateTemp=임시 파일을 만들 수 없습니다. 설치 프로그램이 중단되었습니다.
+LdrCannotCreateTemp=임시 파일을 만들 수 없습니다, 설치를 중단합니다
-LdrCannotExecTemp=임시 디렉터리에서 파일을 실행할 수 없습니다. 설치 프로그램이 중단되었습니다.
+LdrCannotExecTemp=임시 폴더의 파일을 실행할 수 없습니다, 설치를 중단합니다
+HelpTextNote=
+
 ; *** Startup error messages
 LastErrorMessage=%1.%n%n오류 %2: %3
-SetupFileMissing=파일 %1이(가) 설치 디렉터리에서 누락되었습니다. 문제를 해결하거나 프로그램을 새로 받으세요.
+SetupFileMissing=%1 파일이 존재하지 않습니다, 문제를 해결해 보거나 새로운 설치 프로그램을 구하시기 바랍니다.
-SetupFileCorrupt=설치 파일이 손상되었습니다. 프로그램을 새로 받으세요.
+SetupFileCorrupt=설치 파일이 손상되었습니다, 새로운 설치 프로그램을 구하시기 바랍니다.
-SetupFileCorruptOrWrongVer=설치 파일이 손상되었거나 이 버전의 설치 프로그램과 호환되지 않습니다. 문제를 해결하거나 프로그램을 새로 받으세요.
+SetupFileCorruptOrWrongVer=설치 파일의 손상이거나 이 설치 버전과 호환되지 않습니다, 문제를 해결해 보거나 새로운 설치 프로그램을 구하시기 바랍니다.
-InvalidParameter=명령줄에 잘못된 매개 변수가 전달됨:%n%n%1
+InvalidParameter=잘못된 매개 변수입니다:%n%n%1
-SetupAlreadyRunning=설치 프로그램이 이미 실행 중입니다.
+SetupAlreadyRunning=설치가 이미 실행 중입니다.
-WindowsVersionNotSupported=이 프로그램은 컴퓨터에서 실행 중인 버전의 Windows를 지원하지 않습니다.
+WindowsVersionNotSupported=이 프로그램은 귀하의 Windows 버전을 지원하지 않습니다.
-WindowsServicePackRequired=이 프로그램을 설치하려면 %1 서비스 팩 %2 이상이 필요합니다.
+WindowsServicePackRequired=이 프로그램을 실행하려면 %1 sp%2 이상이어야 합니다.
-NotOnThisPlatform=이 프로그램은 %1에서 실행되지 않습니다.
+NotOnThisPlatform=이 프로그램은 %1에서 작동하지 않습니다.
 OnlyOnThisPlatform=이 프로그램은 %1에서 실행해야 합니다.
-OnlyOnTheseArchitectures=이 프로그램은 프로세서 아키텍처 %n%n%1용으로 설계된 Windows 버전에서만 설치할 수 있습니다.
+OnlyOnTheseArchitectures=이 프로그램은 아래 처리 구조와 호환되는 Windows 버전에만 설치할 수 있습니다:%n%n%1
-MissingWOW64APIs=실행 중인 Windows 버전에는 설치 프로그램에서 64비트를 설치하는 데 필요한 기능이 없습니다. 이 문제를 해결하려면 서비스 팩 %1을(를) 설치하세요.
+WinVersionTooLowError=이 프로그램은 %1 버전 %2 이상이 필요합니다.
-WinVersionTooLowError=이 프로그램을 설치하려면 %1 버전 %2 이상이 필요합니다.
+WinVersionTooHighError=이 프로그램은 %1 버전 %2 이상에서 설치할 수 없습니다.
-WinVersionTooHighError=이 프로그램은 %1 버전 %2 이상에서는 설치할 수 없습니다.
+AdminPrivilegesRequired=이 프로그램을 설치하려면 관리자로 로그인해야 합니다.
-AdminPrivilegesRequired=이 프로그램을 설치할 때는 관리자로 로그인해야 합니다.
+PowerUserPrivilegesRequired=이 프로그램을 설치하려면 관리자 또는 고급 사용자로 로그인해야 합니다.
-PowerUserPrivilegesRequired=이 프로그램을 설치할 때는 관리자나 고급 사용자 그룹의 구성원으로 로그인해야 합니다.
+SetupAppRunningError=현재 %1이(가) 실행 중입니다!%n%n지금 그것의 모든 인스턴스를 닫아 주십시오. 그런 다음 계속하려면 "확인"을, 종료하려면 "취소"를 클릭하십시오.
-SetupAppRunningError=설치 프로그램에서 %1(이)가 현재 실행 중임을 감지했습니다.%n%n이 항목의 모든 인스턴스를 지금 닫고 계속하려면 [확인]을, 종료하려면 [취소]를 클릭하세요.
+UninstallAppRunningError=현재 %1이(가) 실행 중입니다!%n%n지금 그것의 모든 인스턴스를 닫아 주십시오. 그런 다음 계속하려면 "확인"을, 종료하려면 "취소"를 클릭하십시오.
-UninstallAppRunningError=제거 작업에서 %1(이)가 현재 실행 중임을 감지했습니다.%n%n이 항목의 모든 인스턴스를 지금 닫고 계속하려면 [확인]을, 종료하려면 [취소]를 클릭하세요.
+
+; *** Startup questions
+PrivilegesRequiredOverrideTitle=설치 모드 선택
+PrivilegesRequiredOverrideInstruction=설치 모드를 선택해 주십시오
+PrivilegesRequiredOverrideText1=%1 은 모든 사용자(관리자 권한 필요) 또는 현재 사용자용으로 설치합니다.
+PrivilegesRequiredOverrideText2=%1 은 현재 사용자 또는 모든 사용자(관리자 권한 필요) 용으로 설치합니다.
+PrivilegesRequiredOverrideAllUsers=모든 사용자용으로 설치(&A)
+PrivilegesRequiredOverrideAllUsersRecommended=모든 사용자용으로 설치(&A) (추천)
+PrivilegesRequiredOverrideCurrentUser=현재 사용자용으로 설치(&M)
+PrivilegesRequiredOverrideCurrentUserRecommended=현재 사용자용으로 설치(&M) (추천)
+
 ; *** Misc. errors
-ErrorCreatingDir=설치 프로그램에서 디렉터리 "%1"을(를) 만들 수 없습니다.
+ErrorCreatingDir="%1" 폴더를 만들 수 없습니다.
-ErrorTooManyFilesInDir=디렉터리 "%1"에 파일이 너무 많으므로 이 디렉터리에 파일을 만들 수 없습니다.
+ErrorTooManyFilesInDir="%1" 폴더에 파일이 너무 많기 때문에 파일을 만들 수 없습니다.
+
 ; *** Setup common messages
-ExitSetupTitle=설치 종료
+ExitSetupTitle=설치 완료
-ExitSetupMessage=설치가 완료되지 않았습니다. 지금 종료하면 프로그램이 설치되지 않습니다.%n%n나중에 설치 프로그램을 다시 실행하여 설치를 끝낼 수 있습니다.%n%n설치 프로그램을 종료하시겠습니까?
+ExitSetupMessage=설치가 완료되지 않았습니다, 여기서 설치를 종료하면 프로그램은 설치되지 않습니다.%n%n설치를 완료하려면 나중에 다시 설치 프로그램을 실행해야 합니다.%n%n그래도 설치를 종료하시겠습니까?
-AboutSetupMenuItem=설치 프로그램 정보(&A)...
+AboutSetupMenuItem=설치 정보(&A)...
-AboutSetupTitle=설치 프로그램 정보
+AboutSetupTitle=설치 정보
-AboutSetupMessage=%1 버전 %2%n%3%n%n%1 홈페이지:%n%4
+AboutSetupMessage=%1 버전 %2%n%3%n%n%1 홈 페이지:%n%4
 AboutSetupNote=
 TranslatorNote=
+
 ; *** Buttons
 ButtonBack=< 뒤로(&B)
 ButtonNext=다음(&N) >
@@ -75,224 +97,271 @@ ButtonOK=Ȯ
 ButtonCancel=취소
 ButtonYes=예(&Y)
 ButtonYesToAll=모두 예(&A)
-ButtonNo=아니요(&N)
+ButtonNo=아니오(&N)
-ButtonNoToAll=모두 아니요(&O)
+ButtonNoToAll=모두 아니오(&O)
-ButtonFinish=마침(&F)
+ButtonFinish=종료(&F)
 ButtonBrowse=찾아보기(&B)...
-ButtonWizardBrowse=찾아보기(&R)
+ButtonWizardBrowse=찾아보기(&R)...
 ButtonNewFolder=새 폴더 만들기(&M)
+
 ; *** "Select Language" dialog messages
 SelectLanguageTitle=설치 언어 선택
-SelectLanguageLabel=설치 중에 사용할 언어를 선택하세요.
+SelectLanguageLabel=설치에 사용할 언어를 선택하십시오.
+
 ; *** Common wizard text
-ClickNext=계속하려면 [다음]을 클릭하고 설치 프로그램을 종료하려면 [취소]를 클릭하세요.
+ClickNext=계속하려면 "다음"을 클릭하고 설치를 종료하려면 "취소"를 클릭합니다.
 BeveledLabel=
 BrowseDialogTitle=폴더 찾아보기
-BrowseDialogLabel=아래 목록에서 폴더를 선택한 다음 [확인]을 클릭하세요.
+BrowseDialogLabel=아래 목록에서 폴더를 선택한 다음 "확인"을 클릭합니다.
 NewFolderName=새 폴더
+
 ; *** "Welcome" wizard page
 WelcomeLabel1=[name] 설치 마법사 시작
-WelcomeLabel2=이 마법사는 컴퓨터에 [name/ver]을(를) 설치합니다.%n%n계속하기 전에 다른 모든 응용 프로그램을 닫는 것이 좋습니다.
+WelcomeLabel2=이 마법사는 귀하의 컴퓨터에 [name/ver]을(를) 설치할 것입니다.%n%n설치하기 전에 다른 응용프로그램들을 모두 닫으시기 바랍니다.
+
 ; *** "Password" wizard page
-WizardPassword=암호
+WizardPassword=비밀 번호
-PasswordLabel1=이 설치는 암호로 보호되고 있습니다.
+PasswordLabel1=이 설치 마법사는 비밀 번호로 보호되어 있습니다.
-PasswordLabel3=계속하려면 암호를 입력한 다음 [다음]을 클릭하세요. 암호는 대소문자를 구분합니다.
+PasswordLabel3=비밀 번호를 입력하고 "다음"을 클릭하십시오. 비밀 번호는 대소문자를 구분해야 합니다.
-PasswordEditLabel=암호(&P):
+PasswordEditLabel=비밀 번호(&P):
-IncorrectPassword=입력한 암호가 잘못되었습니다. 다시 시도하세요.
+IncorrectPassword=비밀 번호가 정확하지 않습니다, 다시 입력하십시오.
+
 ; *** "License Agreement" wizard page
 WizardLicense=사용권 계약
-LicenseLabel=계속하기 전에 다음 중요한 정보를 읽어 보세요.
+LicenseLabel=계속하기 전에 다음의 중요 정보를 읽어보십시오.
-LicenseLabel3=다음 사용권 계약을 읽어 주세요. 설치를 계속하려면 먼저 이 계약 조건에 동의해야 합니다.
+LicenseLabel3=다음 사용권 계약을 읽어보십시오, 설치를 계속하려면 이 계약에 동의해야 합니다.
-LicenseAccepted=계약에 동의함(&A)
+LicenseAccepted=동의합니다(&A)
-LicenseNotAccepted=계약에 동의 안 함(&D)
+LicenseNotAccepted=동의하지 않습니다(&D)
+
 ; *** "Information" wizard pages
 WizardInfoBefore=정보
-InfoBeforeLabel=계속하기 전에 다음 중요한 정보를 읽어 보세요.
+InfoBeforeLabel=계속하기 전에 다음의 중요 정보를 읽어보십시오.
-InfoBeforeClickLabel=설치를 계속 진행할 준비가 되면 [다음]을 클릭합니다.
+InfoBeforeClickLabel=설치를 계속하려면 "다음"을 클릭하십시오.
 WizardInfoAfter=정보
-InfoAfterLabel=계속하기 전에 다음 중요한 정보를 읽어 보세요.
+InfoAfterLabel=계속하기 전에 다음의 중요 정보를 읽어보십시오.
-InfoAfterClickLabel=설치를 계속 진행할 준비가 되면 [다음]을 클릭합니다.
+InfoAfterClickLabel=설치를 계속하려면 "다음"을 클릭하십시오.
+
 ; *** "User Information" wizard page
 WizardUserInfo=사용자 정보
-UserInfoDesc=정보를 입력하세요.
+UserInfoDesc=사용자 정보를 입력하십시오.
 UserInfoName=사용자 이름(&U):
 UserInfoOrg=조직(&O):
-UserInfoSerial=일련 번호(&S):
+UserInfoSerial=시리얼 번호(&S):
-UserInfoNameRequired=이름을 입력해야 합니다.
+UserInfoNameRequired=사용자 이름을 입력하십시오.
+
 ; *** "Select Destination Location" wizard page
-WizardSelectDir=대상 위치 선택
+WizardSelectDir=설치 위치 선택
-SelectDirDesc=[name]을(를) 어디에 설치하시겠습니까?
+SelectDirDesc=[name]의 설치 위치를 선택하십시오.
-SelectDirLabel3=설치 프로그램에서 [name]을(를) 다음 폴더에 설치합니다.
+SelectDirLabel3=다음 폴더에 [name]을(를) 설치합니다.
-SelectDirBrowseLabel=계속하려면 [다음]을 클릭하세요. 다른 폴더를 선택하려면 [찾아보기]를 클릭하세요.
+SelectDirBrowseLabel=계속하려면 "다음"을, 다른 폴더를 선택하려면 "찾아보기"를 클릭하십시오.
-DiskSpaceMBLabel=적어도 [mb]MB의 여유 디스크 공간이 필요합니다.
+DiskSpaceGBLabel=이 프로그램은 최소 [gb] GB의 디스크 여유 공간이 필요합니다.
-CannotInstallToNetworkDrive=설치 프로그램은 네트워크 드라이브에 설치할 수 없습니다.
+DiskSpaceMBLabel=이 프로그램은 최소 [mb] MB의 디스크 여유 공간이 필요합니다.
-CannotInstallToUNCPath=설치 프로그램은 UNC 경로에 설치할 수 없습니다.
+CannotInstallToNetworkDrive=네트워크 드라이브에 설치할 수 없습니다.
-InvalidPath=드라이브 문자와 함께 전체 경로를 입력해야 합니다. 예:%n%nC:\APP%n%n또는 다음 형태의 UNC 경로:%n%n\\server\share
+CannotInstallToUNCPath=UNC 경로에 설치할 수 없습니다.
-InvalidDrive=선택한 드라이브나 UNC 공유가 없거나 이 두 항목에 액세스할 수 없습니다. 다른 드라이브나 UNC 공유를 선택하세요.
+InvalidPath=드라이브 문자를 포함한 전체 경로를 입력하십시오.%n※ 예: C:\APP %n%n또는, UNC 형식의 경로를 입력하십시오.%n※ 예: \\server\share
-DiskSpaceWarningTitle=디스크 공간 부족
+InvalidDrive=선택한 드라이브 또는 UNC 공유가 존재하지 않거나 액세스할 수 없습니다, 다른 경로를 선택하십시오.
-DiskSpaceWarning=설치 프로그램을 설치하려면 여유 설치 공간이 적어도 %1KB가 필요하지만 선택한 드라이브의 가용 공간은 %2KB밖에 없습니다.%n%n그래도 계속하시겠습니까?
+DiskSpaceWarningTitle=디스크 공간이 부족합니다
+DiskSpaceWarning=설치 시 최소 %1 KB 디스크 공간이 필요하지만, 선택한 드라이브의 여유 공간은 %2 KB 밖에 없습니다.%n%n그래도 계속하시겠습니까?
 DirNameTooLong=폴더 이름 또는 경로가 너무 깁니다.
-InvalidDirName=폴더 이름이 잘못되었습니다.
+InvalidDirName=폴더 이름이 유효하지 않습니다.
-BadDirName32=폴더 이름에는 %n%n%1 문자를 사용할 수 없습니다.
+BadDirName32=폴더 이름은 다음 문자를 포함할 수 없습니다:%n%n%1
-DirExistsTitle=폴더 있음
+DirExistsTitle=폴더가 존재합니다
-DirExists=폴더 %n%n%1%n%n이(가) 이미 있습니다. 그래도 해당 폴더에 설치하시겠습니까?
+DirExists=폴더 %n%n%1%n%n이(가) 이미 존재합니다, 이 폴더에 설치하시겠습니까?
-DirDoesntExistTitle=폴더 없음
+DirDoesntExistTitle=폴더가 존재하지 않습니다
-DirDoesntExist=폴더 %n%n%1%n%n이(가) 없습니다. 폴더를 만드시겠습니까?
+DirDoesntExist=폴더 %n%n%1%n%n이(가) 존재하지 않습니다, 새로 폴더를 만드시겠습니까?
+
 ; *** "Select Components" wizard page
 WizardSelectComponents=구성 요소 선택
-SelectComponentsDesc=어떤 구성 요소를 설치하시겠습니까?
+SelectComponentsDesc=설치할 구성 요소를 선택하십시오.
-SelectComponentsLabel2=설치할 구성 요소는 선택하고 설치하지 않을 구성 요소는 지우세요. 계속 진행할 준비가 되면 [다음]을 클릭하세요.
+SelectComponentsLabel2=필요한 구성 요소는 체크하고 불필요한 구성 요소는 체크 해제합니다, 계속하려면 "다음"을 클릭하십시오.
-FullInstallation=전체 설치
+FullInstallation=모두 설치
 ; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=Compact 설치
+CompactInstallation=최소 설치
 CustomInstallation=사용자 지정 설치
-NoUninstallWarningTitle=구성 요소가 있음
+NoUninstallWarningTitle=구성 요소가 존재합니다
-NoUninstallWarning=설치 프로그램에서 구성 요소 %n%n%1%n%n이(가) 컴퓨터에 이미 설치되어 있음을 감지했습니다. 이러한 구성 요소는 선택 취소해도 제거되지 않습니다.%n%n그래도 계속하시겠습니까?
+NoUninstallWarning=다음 구성 요소가 이미 설치되어 있습니다:%n%n%1%n%n위 구성 요소을 선택하지 않으면, 프로그램 제거시 이 구성 요소들은 제거되지 않을 겁니다.%n%n그래도 계속하시겠습니까?
-ComponentSize1=%1KB
+ComponentSize1=%1 KB
-ComponentSize2=%1MB
+ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=현재 선택을 위해서는 적어도 [mb]MB의 디스크 공간이 필요합니다.
+ComponentsDiskSpaceGBLabel=현재 선택은 최소 [gb] GB의 디스크 여유 공간이 필요합니다.
+ComponentsDiskSpaceMBLabel=현재 선택은 최소 [mb] MB의 디스크 여유 공간이 필요합니다.
+
 ; *** "Select Additional Tasks" wizard page
 WizardSelectTasks=추가 작업 선택
-SelectTasksDesc=어떤 작업을 추가로 수행하시겠습니까?
+SelectTasksDesc=수행할 추가 작업을 선택하십시오.
-SelectTasksLabel2=설치 프로그램에서 [name]을(를) 설치하는 동안 수행할 추가 작업을 선택한 후 [다음]을 클릭하세요.
+SelectTasksLabel2=[name] 설치 과정에 포함할 추가 작업을 선택한 후, "다음"을 클릭하십시오.
+
 ; *** "Select Start Menu Folder" wizard page
 WizardSelectProgramGroup=시작 메뉴 폴더 선택
-SelectStartMenuFolderDesc=설치 프로그램에서 프로그램의 바로 가기를 어디에 만들도록 하시겠습니까?
+SelectStartMenuFolderDesc=어디에 프로그램 바로가기를 위치하겠습니까?
-SelectStartMenuFolderLabel3=설치 프로그램에서 프로그램의 바로 가기를 다음 시작 메뉴 폴더에 만듭니다.
+SelectStartMenuFolderLabel3=다음 시작 메뉴 폴더에 프로그램 바로가기를 만듭니다.
-SelectStartMenuFolderBrowseLabel=계속하려면 [다음]을 클릭하세요. 다른 폴더를 선택하려면 [찾아보기]를 클릭하세요.
+SelectStartMenuFolderBrowseLabel=계속하려면 "다음"을 클릭하고, 다른 폴더를 선택하려면 "찾아보기"를 클릭하십시오.
-MustEnterGroupName=폴더 이름을 입력해야 합니다.
+MustEnterGroupName=폴더 이름을 입력하십시오.
 GroupNameTooLong=폴더 이름 또는 경로가 너무 깁니다.
-InvalidGroupName=폴더 이름이 잘못되었습니다.
+InvalidGroupName=폴더 이름이 유효하지 않습니다.
-BadGroupName=폴더 이름에는 %n%n%1 문자를 사용할 수 없습니다.
+BadGroupName=폴더 이름은 다음 문자를 포함할 수 없습니다:%n%n%1
 NoProgramGroupCheck2=시작 메뉴 폴더를 만들지 않음(&D)
+
 ; *** "Ready to Install" wizard page
-WizardReady=설치 준비됨
+WizardReady=설치 준비 완료
-ReadyLabel1=이제 설치 프로그램이 컴퓨터에 [name] 설치를 시작할 준비가 되었습니다.
+ReadyLabel1=귀하의 컴퓨터에 [name]을(를) 설치할 준비가 되었습니다.
-ReadyLabel2a=설치를 계속하려면 [설치]를 클릭하고, 설정을 검토하거나 변경하려면 [뒤로]를 클릭하세요.
+ReadyLabel2a=설치를 계속하려면 "설치"를, 설정을 변경하거나 검토하려면 "뒤로"를 클릭하십시오.
-ReadyLabel2b=설치를 계속하려면 [설치]를 클릭하세요.
+ReadyLabel2b=설치를 계속하려면 "설치"를 클릭하십시오.
 ReadyMemoUserInfo=사용자 정보:
-ReadyMemoDir=대상 위치:
+ReadyMemoDir=설치 위치:
 ReadyMemoType=설치 유형:
 ReadyMemoComponents=선택한 구성 요소:
 ReadyMemoGroup=시작 메뉴 폴더:
 ReadyMemoTasks=추가 작업:
+
 ; *** "Preparing to Install" wizard page
 WizardPreparing=설치 준비 중
-PreparingDesc=설치 프로그램에서 컴퓨터에 [name] 설치를 준비하고 있습니다.
+PreparingDesc=귀하의 컴퓨터에 [name] 설치를 준비하는 중입니다.
-PreviousInstallNotCompleted=이전 프로그램의 설치/제거 작업이 완료되지 않았습니다. 해당 설치를 완료하려면 컴퓨터를 다시 시작해야 합니다.%n%n컴퓨터를 다시 시작한 후 [name] 설치를 완료하려면 설치 프로그램을 다시 실행하세요.
+PreviousInstallNotCompleted=이전 프로그램의 설치/제거 작업이 완료되지 않았습니다, 완료하려면 컴퓨터를 다시 시작해야 합니다.%n%n컴퓨터를 다시 시작한 후, 설치 마법사를 다시 실행하여 [name] 설치를 완료하시기 바랍니다.
-CannotContinue=설치 프로그램을 계속할 수 없습니다. 종료하려면 [취소]를 클릭하세요.
+CannotContinue=설치를 계속할 수 없습니다, "취소"를 클릭하여 설치를 종료하십시오.
-ApplicationsFound=설치 프로그램에서 업데이트해야 하는 파일이 다음 응용 프로그램에 사용되고 있습니다. 설치 프로그램에서 이러한 응용 프로그램을 자동으로 닫도록 허용하는 것이 좋습니다.
+ApplicationsFound=다음 응용프로그램이 설치 업데이트가 필요한 파일을 사용하고 있습니다, 설치 마법사가 이런 응용프로그램을 자동으로 종료할 수 있도록 허용하시기 바랍니다.
-ApplicationsFound2=설치 프로그램에서 업데이트해야 하는 파일이 다음 응용 프로그램에 사용되고 있습니다. 설치 프로그램에서 이러한 응용 프로그램을 자동으로 닫도록 허용하는 것이 좋습니다. 설치가 완료되면 설치 프로그램에서 응용 프로그램을 다시 시작하려고 시도합니다.
+ApplicationsFound2=다음 응용프로그램이 설치 업데이트가 필요한 파일을 사용하고 있습니다, 설치 마법사가 이런 응용프로그램을 자동으로 종료할 수 있도록 허용하시기 바랍니다. 설치가 완료되면, 설치 마법사는 이 응용프로그램이 다시 시작되도록 시도할 겁니다.
-CloseApplications=응용 프로그램 자동 닫기(&A)
+CloseApplications=자동으로 응용프로그램을 종료함(&A)
-DontCloseApplications=응용 프로그램을 닫지 않음(&D)
+DontCloseApplications=응용프로그램을 종료하지 않음(&D)
-ErrorCloseApplications=설치 프로그램에서 일부 응용 프로그램을 자동으로 닫을 수 없습니다. 계속하기 전에 설치 프로그램에서 업데이트해야 하는 파일을 사용하는 응용 프로그램을 모두 닫는 것이 좋습니다.
+ErrorCloseApplications=설치 마법사가 응용프로그램을 자동으로 종료할 수 없습니다, 계속하기 전에 설치 업데이트가 필요한 파일을 사용하고 있는 응용프로그램을 모두 종료하시기 바랍니다.
+PrepareToInstallNeedsRestart=설치 마법사는 귀하의 컴퓨터를 재시작해야 합니다. [name] 설치를 완료하기 위해 컴퓨터를 다시 시작한 후에 설치 마법사를 다시 실행해 주십시오.%n%n지금 다시 시작하시겠습니까?
+
 ; *** "Installing" wizard page
 WizardInstalling=설치 중
-InstallingLabel=설치 프로그램에서 컴퓨터에 [name]을(를) 설치하는 동안 기다려 주세요.
+InstallingLabel=귀하의 컴퓨터에 [name]을(를) 설치하는 중... 잠시 기다려 주십시오.
+
 ; *** "Setup Completed" wizard page
-FinishedHeadingLabel=[name] 설정 마법사를 완료하는 중
+FinishedHeadingLabel=[name] 설치 마법사 완료
-FinishedLabelNoIcons=설치 프로그램에서 컴퓨터에 [name]을(를) 설치했습니다.
+FinishedLabelNoIcons=귀하의 컴퓨터에 [name]이(가) 설치되었습니다.
-FinishedLabel=설치 프로그램에서 컴퓨터에 [name]을(를) 설치했습니다. 설치한 바로 가기를 선택하여 해당 응용 프로그램을 시작할 수 있습니다.
+FinishedLabel=귀하의 컴퓨터에 [name]이(가) 설치되었습니다, 응용프로그램은 설치된 아이콘을 선택하여 시작할 수 있습니다.
-ClickFinish=설치 프로그램을 종료하려면 [마침]을 클릭하세요.
+ClickFinish=설치를 끝내려면 "종료"를 클릭하십시오.
-FinishedRestartLabel=[name] 설치를 완료하려면 설치 프로그램에서 컴퓨터를 다시 시작해야 합니다. 지금 다시 시작하시겠습니까?
+FinishedRestartLabel=[name] 설치를 완료하려면, 컴퓨터를 다시 시작해야 합니다. 지금 다시 시작하시겠습니까?
-FinishedRestartMessage=[name] 설치를 완료하려면 설치 프로그램에서 컴퓨터를 다시 시작해야 합니다.%n%n지금 다시 시작하시겠습니까?
+FinishedRestartMessage=[name] 설치를 완료하려면, 컴퓨터를 다시 시작해야 합니다.%n%n지금 다시 시작하시겠습니까?
-ShowReadmeCheck=예, README 파일을 보겠습니다.
+ShowReadmeCheck=예, README 파일을 표시합니다
-YesRadio=예, 컴퓨터를 지금 다시 시작하겠습니다(&Y).
+YesRadio=예, 지금 다시 시작합니다(&Y)
-NoRadio=아니요, 컴퓨터를 나중에 다시 시작하겠습니다(&N).
+NoRadio=아니오, 나중에 다시 시작합니다(&N)
 ; used for example as 'Run MyProg.exe'
 RunEntryExec=%1 실행
 ; used for example as 'View Readme.txt'
-RunEntryShellExec=%1 보기
+RunEntryShellExec=%1 표시
+
 ; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=설치 프로그램에서 다음 디스크가 필요함
+ChangeDiskTitle=디스크가 필요합니다
-SelectDiskLabel2=디스크 %1을(를) 삽입한 다음 [확인]을 클릭하세요.%n%n이 디스크의 파일이 아래 표시된 폴더가 아닌 다른 폴더에 있으면 올바른 경로를 입력하거나 [찾아보기]를 클릭하세요.
+SelectDiskLabel2=디스크 %1을(를) 삽입하고 "확인"을 클릭하십시오.%n%n이 디스크 상의 파일이 아래 경로가 아닌 곳에 있는 경우, 올바른 경로를 입력하거나 "찾아보기"를 클릭하시기 바랍니다.
 PathLabel=경로(&P):
-FileNotInDir2="%2"에서 파일 "%1"을(를) 찾을 수 없습니다. 올바른 디스크를 삽입하거나 다른 폴더를 선택하세요.
+FileNotInDir2=%2에 파일 %1을(를) 위치할 수 없습니다, 올바른 디스크를 삽입하거나 다른 폴더를 선택하십시오.
-SelectDirectoryLabel=다음 디스크의 위치를 지정하세요.
+SelectDirectoryLabel=다음 디스크의 위치를 지정하십시오.
+
 ; *** Installation phase messages
-SetupAborted=설치를 완료하지 못했습니다.%n%n문제를 해결한 다음 설치 프로그램을 다시 실행하세요.
+SetupAborted=설치가 완료되지 않았습니다.%n%n문제를 해결한 후, 다시 설치를 시작하십시오.
-EntryAbortRetryIgnore=다시 시도하려면 [다시 시도]를, 그래도 계속하려면 [무시]를, 설치를 취소하려면 [중단]을 클릭하세요.
+AbortRetryIgnoreSelectAction=액션을 선택해 주십시오.
+AbortRetryIgnoreRetry=재시도(&T)
+AbortRetryIgnoreIgnore=오류를 무시하고 진행(&I)
+AbortRetryIgnoreCancel=설치 취소
+
 ; *** Installation status messages
-StatusClosingApplications=응용 프로그램을 닫는 중...
+StatusClosingApplications=응용프로그램을 종료하는 중...
-StatusCreateDirs=디렉터리를 만드는 중...
+StatusCreateDirs=폴더를 만드는 중...
 StatusExtractFiles=파일을 추출하는 중...
-StatusCreateIcons=바로 가기를 만드는 중...
+StatusCreateIcons=바로가기를 생성하는 중...
 StatusCreateIniEntries=INI 항목을 만드는 중...
 StatusCreateRegistryEntries=레지스트리 항목을 만드는 중...
 StatusRegisterFiles=파일을 등록하는 중...
 StatusSavingUninstall=제거 정보를 저장하는 중...
 StatusRunProgram=설치를 완료하는 중...
-StatusRestartingApplications=응용 프로그램을 다시 시작하는 중...
+StatusRestartingApplications=응용프로그램을 다시 시작하는 중...
-StatusRollback=변경 사항을 롤백하는 중...
+StatusRollback=변경을 취소하는 중...
+
 ; *** Misc. errors
 ErrorInternal2=내부 오류: %1
 ErrorFunctionFailedNoCode=%1 실패
-ErrorFunctionFailed=%1 실패, 코드 %2
+ErrorFunctionFailed=%1 실패; 코드 %2
-ErrorFunctionFailedWithMessage=%1 실패, 코드 %2.%n%3
+ErrorFunctionFailedWithMessage=%1 실패, 코드: %2.%n%3
-ErrorExecutingProgram=파일을 실행할 수 없음:%n%1
+ErrorExecutingProgram=파일 실행 오류:%n%1
+
 ; *** Registry errors
-ErrorRegOpenKey=레지스트리 키를 여는 중 오류 발생:%n%1\%2
+ErrorRegOpenKey=레지스트리 키 열기 오류:%n%1\%2
-ErrorRegCreateKey=레지스트리 키를 만드는 중 오류 발생:%n%1\%2
+ErrorRegCreateKey=레지스트리 키 생성 오류:%n%1\%2
-ErrorRegWriteKey=레지스트리 키에 기록하는 중 오류 발생:%n%1\%2
+ErrorRegWriteKey=레지스트리 키 쓰기 오류:%n%1\%2
+
 ; *** INI errors
-ErrorIniEntry=파일 "%1"에 INI 항목을 만드는 중에 오류가 발생했습니다. 
+ErrorIniEntry=%1 파일에 INI 항목 만들기 오류입니다.
+
 ; *** File copying errors
-FileAbortRetryIgnore=다시 시도하려면 [다시 시도]를, 이 파일을 건너뛰려면 [무시](권장되지 않음)를, 설치를 취소하려면 [중단]을 클릭하세요.
+FileAbortRetryIgnoreSkipNotRecommended=이 파일을 건너띔(&S) (권장하지 않습니다)
-FileAbortRetryIgnore2=다시 시도하려면 [다시 시도]를, 그래도 계속하려면 [무시](권장되지 않음)를, 설치를 취소하려면 [중단]을 클릭하세요.
+FileAbortRetryIgnoreIgnoreNotRecommended=오류를 무시하고 진행(&I) (권장하지 않습니다)
-SourceIsCorrupted=원본 파일이 손상되었습니다.
+SourceIsCorrupted=원본 파일이 손상됨
-SourceDoesntExist=원본 파일 "%1"이(가) 없습니다.
+SourceDoesntExist=원본 파일 %1이(가) 존재하지 않음
-ExistingFileReadOnly=기존 파일이 읽기 전용으로 표시되어 있습니다.%n%n읽기 전용 특성을 제거하고 다시 시도하려면 [다시 시도]를, 이 파일을 건너뛰려면 [무시]를, 설치를 취소하려면 [중단]을 클릭하세요.
+ExistingFileReadOnly2=기존 파일은 읽기 전용이기때문에 대체할 수 없습니다.
-ErrorReadingExistingDest=기존 파일을 읽는 중 오류 발생:
+ExistingFileReadOnlyRetry=읽기 전용 속성을 해제하고 다시 시도하려면(&R)
-FileExists=해당 파일이 이미 있습니다.%n%n설치 프로그램에서 이 파일을 덮어쓰도록 하시겠습니까?
+ExistingFileReadOnlyKeepExisting=기존 파일을 유지(&K)
-ExistingFileNewer=기존 파일이 설치 프로그램에서 설치하려는 파일보다 최신입니다. 기존 파일을 유지할 것을 권장합니다.%n%n기존 파일을 유지하시겠습니까?
+ErrorReadingExistingDest=기존 파일을 읽는 동안 오류 발생:
-ErrorChangingAttr=기존 파일의 특성을 변경하는 중 오류 발생:
+FileExists=파일이 이미 존재합니다.%n%n파일을 덮어쓰시겠습니까?
-ErrorCreatingTemp=대상 디렉터리에 파일을 만드는 중 오류 발생:
+ExistingFileNewer=기존 파일이 설치하려고 하는 파일보다 새 파일입니다, 기존 파일을 유지하시기 바랍니다.%n%n기존 파일을 유지하시겠습니까?
-ErrorReadingSource=원본 파일을 읽는 중 오류 발생:
+ErrorChangingAttr=기존 파일의 속성을 변경하는 동안 오류 발생:
-ErrorCopying=파일을 복사하는 중 오류 발생:
+ErrorCreatingTemp=대상 폴더에 파일을 만드는 동안 오류 발생:
-ErrorReplacingExistingFile=기존 파일을 바꾸는 중 오류 발생:
+ErrorReadingSource=원본 파일을 읽는 동안 오류 발생:
+ErrorCopying=파일을 복사하는 동안 오류 발생:
+ErrorReplacingExistingFile=기존 파일을 교체하는 동안 오류 발생:
 ErrorRestartReplace=RestartReplace 실패:
-ErrorRenamingTemp=대상 디렉터리에 있는 파일 이름을 바꾸는 중 오류 발생:
+ErrorRenamingTemp=대상 폴더 내의 파일 이름을 바꾸는 동안 오류 발생:
-ErrorRegisterServer=DLL/OCX를 등록할 수 없음: %1
+ErrorRegisterServer=DLL/OCX 등록 실패: %1
-ErrorRegSvr32Failed=종료 코드 %1과(와) 함께 RegSvr32 실패
+ErrorRegSvr32Failed=RegSvr32가 다음 종료 코드로 실패: %1
-ErrorRegisterTypeLib=형식 라이브러리를 등록할 수 없음: %1
+ErrorRegisterTypeLib=다음 유형의 라이브러리 등록에 실패: %1
+
+; *** Uninstall display name markings
+; used for example as 'My Program (32-bit)'
+UninstallDisplayNameMark=%1 (%2)
+; used for example as 'My Program (32-bit, All users)'
+UninstallDisplayNameMarks=%1 (%2, %3)
+UninstallDisplayNameMark32Bit=32비트
+UninstallDisplayNameMark64Bit=64비트
+UninstallDisplayNameMarkAllUsers=모든 사용자
+UninstallDisplayNameMarkCurrentUser=현재 사용자
+
 ; *** Post-installation errors
-ErrorOpeningReadme=README 파일을 여는 중에 오류가 발생했습니다.
+ErrorOpeningReadme=README 파일을 여는 중 오류가 발생했습니다.
-ErrorRestartingComputer=설치 프로그램에서 컴퓨터를 다시 시작할 수 없습니다. 수동으로 진행하세요.
+ErrorRestartingComputer=컴퓨터를 다시 시작할 수 없습니다, 수동으로 다시 시작하십시오.
+
 ; *** Uninstaller messages
-UninstallNotFound=파일 "%1"이(가) 없습니다. 제거할 수 없습니다.
+UninstallNotFound=파일 %1이(가) 존재하지 않기 때문에, 제거를 실행할 수 없습니다.
-UninstallOpenError=파일 "%1"을(를) 열 수 없습니다. 제거할 수 없습니다.
+UninstallOpenError=파일 %1을(를) 열 수 없기 때문에, 제거를 실행할 수 없습니다.
-UninstallUnsupportedVer=제거 로그 파일 "%1"이(가) 이 버전의 제거 프로그램에서 인식하지 못하는 형식입니다. 제거할 수 없습니다.
+UninstallUnsupportedVer=삭제 로그 파일 "%1"은(는) 이 삭제 마법사로 인식할 수 없는 형식이기 때문에, 제거를 실행할 수 없습니다.
-UninstallUnknownEntry=제거 로그에서 알 수 없는 항목(%1)이 발견되었습니다.
+UninstallUnknownEntry=알 수 없는 항목 %1이(가) 삭제 로그에 포함되어 있습니다.
-ConfirmUninstall=%1과(와) 해당 구성 요소를 모두 완전히 제거하시겠습니까?
+ConfirmUninstall=정말 %1와(과) 그 구성 요소를 모두 제거하시겠습니까?
-UninstallOnlyOnWin64=이 설치는 64비트 Windows에서만 제거할 수 있습니다.
+UninstallOnlyOnWin64=이 프로그램은 64비트 Windows에서만 제거할 수 있습니다.
-OnlyAdminCanUninstall=이 설치는 관리자 권한이 있는 사용자만 제거할 수 있습니다.
+OnlyAdminCanUninstall=이 프로그램을 제거하려면 관리자 권한이 필요합니다.
-UninstallStatusLabel=컴퓨터에서 %1을(를) 제거하는 동안 기다려 주세요.
+UninstallStatusLabel=귀하의 컴퓨터에서 %1을(를) 제거하는 중... 잠시 기다려 주십시오.
-UninstalledAll=컴퓨터에서 %1을(를) 제거했습니다.
+UninstalledAll=%1이(가) 성공적으로 제거되었습니다!
-UninstalledMost=%1 제거가 완료되었습니다.%n%n일부 요소는 제거할 수 없습니다. 이러한 항목은 수동으로 제거할 수 있습니다.
+UninstalledMost=%1 제거가 완료되었습니다.%n%n일부 요소는 삭제할 수 없으니, 수동으로 제거하시기 바랍니다.
-UninstalledAndNeedsRestart=%1 제거를 완료하려면 컴퓨터를 다시 시작해야 합니다.%n%n지금 다시 시작하시겠습니까?
+UninstalledAndNeedsRestart=%1의 제거를 완료하려면, 컴퓨터를 다시 시작해야 합니다.%n%n지금 다시 시작하시겠습니까?
-UninstallDataCorrupted="%1" 파일이 손상되었습니다. 제거할 수 없습니다.
+UninstallDataCorrupted=파일 "%1"이(가) 손상되었기 때문에, 제거를 실행할 수 없습니다.
+
 ; *** Uninstallation phase messages
 ConfirmDeleteSharedFileTitle=공유 파일을 제거하시겠습니까?
-ConfirmDeleteSharedFile2=시스템에서는 이제 다음 공유 파일을 사용하는 프로그램이 없는 것으로 표시됩니다. 제거 작업을 통해 이 공유 파일을 제거하시겠습니까?%n%n아직 이 파일을 사용하는 프로그램이 있는데 이 파일을 제거하면 해당 프로그램이 올바르게 작동하지 않을 수 있습니다. 잘 모르는 경우 [아니요]를 선택하세요. 시스템에 파일을 그대로 두어도 아무런 문제가 발생하지 않습니다.
+ConfirmDeleteSharedFile2=시스템의 어떤 프로그램도 다음 공유 파일을 사용하지 않습니다, 이 공유 파일을 삭제하시겠습니까?%n%n이 파일을 다른 프로그램이 공유하고 있는 상태에서 이 파일을 제거할 경우, 해당 프로그램이 제대로 작동하지 않을 수 있으니, 확신이 없으면 "아니오"를 선택하셔도 됩니다. 시스템에 파일이 남아 있어도 문제가 되진 않습니다.
 SharedFileNameLabel=파일 이름:
 SharedFileLocationLabel=위치:
 WizardUninstalling=제거 상태
 StatusUninstalling=%1을(를) 제거하는 중...
+
 ; *** Shutdown block reasons
 ShutdownBlockReasonInstallingApp=%1을(를) 설치하는 중입니다.
 ShutdownBlockReasonUninstallingApp=%1을(를) 제거하는 중입니다.
+
 ; The custom messages below aren't used by Setup itself, but if you make
 ; use of them in your scripts, you'll want to translate them.
+
 [CustomMessages]
+
 NameAndVersion=%1 버전 %2
-AdditionalIcons=추가 바로 가기:
+AdditionalIcons=아이콘 추가:
-CreateDesktopIcon=바탕 화면 바로 가기 만들기(&D)
+CreateDesktopIcon=바탕 화면에 바로가기 만들기(&D)
-CreateQuickLaunchIcon=빠른 실행 바로 가기 만들기(&Q)
+CreateQuickLaunchIcon=빠른 실행 아이콘 만들기(&Q)
-ProgramOnTheWeb=%1 웹 정보
+ProgramOnTheWeb=%1 웹페이지
 UninstallProgram=%1 제거
-LaunchProgram=%1 시작
+LaunchProgram=%1 실행
-AssocFileExtension=%1을(를) %2 파일 확장명과 연결(&A)
+AssocFileExtension=파일 확장자 %2을(를) %1에 연결합니다.
-AssocingFileExtension=%1을(를) %2 파일 확장명과 연결 중...
+AssocingFileExtension=파일 확장자 %2을(를) %1에 연결하는 중...
 AutoStartProgramGroupDescription=시작:
-AutoStartProgram=%1 자동 시작
+AutoStartProgram=%1을(를) 자동으로 시작
-AddonHostProgramNotFound=선택한 폴더에서 %1을(를) 찾을 수 없습니다.%n%n그래도 계속하시겠습니까?
+AddonHostProgramNotFound=%1은(는) 선택한 폴더에 위치할 수 없습니다.%n%n그래도 계속하시겠습니까?

build/win32/i18n/Default.zh-cn.isl

@@ -1,16 +1,17 @@
-; *** Inno Setup version 5.5.3+ Simplified Chinese messages ***
+; *** Inno Setup version 6.0.3+ Chinese Simplified messages ***
 ;
-; To download user-contributed translations of this file, go to:
+; Maintained by Zhenghan Yang
-;   http://www.jrsoftware.org/files/istrans/
+; Email: 847320916@QQ.com
+; Translation based on network resource
+; The latest Translation is on https://github.com/kira-96/Inno-Setup-Chinese-Simplified-Translation
 ;
-; Note: When translating this text, do not add periods (.) to the end of
+
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
 [LangOptions]
 ; The following three entries are very important. Be sure to read and 
 ; understand the '[LangOptions] section' topic in the help file.
-LanguageName=Simplified Chinese
+LanguageName=简体中文
+; If Language Name display incorrect, uncomment next line
+; LanguageName=<7B80><4F53><4E2D><6587>
 LanguageID=$0804
 LanguageCodePage=936
 ; If the language you are translating to requires special font faces or
@@ -23,276 +24,342 @@ LanguageCodePage=936
 ;TitleFontSize=29
 ;CopyrightFontName=Arial
 ;CopyrightFontSize=8
+
 [Messages]
-; *** Application titles
+
-SetupAppTitle=安装程序
+; *** 应用程序标题
-SetupWindowTitle=安装程序 - %1
+SetupAppTitle=安装
-UninstallAppTitle=卸载
+SetupWindowTitle=安装 - %1
-UninstallAppFullTitle=%1 卸载
+UninstallAppTitle=卸载
+UninstallAppFullTitle=%1 卸载
+
 ; *** Misc. common
-InformationTitle=信息
+InformationTitle=信息
-ConfirmTitle=确认
+ConfirmTitle=确认
-ErrorTitle=错误
+ErrorTitle=错误
+
 ; *** SetupLdr messages
-SetupLdrStartupMessage=这将安装 %1。是否要继续?
+SetupLdrStartupMessage=现在将安装 %1。您想要继续吗？
-LdrCannotCreateTemp=无法创建临时文件。安装程序已中止
+LdrCannotCreateTemp=不能创建临时文件。安装中断。
-LdrCannotExecTemp=无法在临时目录中执行文件。安装程序已中止
+LdrCannotExecTemp=不能执行临时目录中的文件。安装中断。
-; *** Startup error messages
+HelpTextNote=
-LastErrorMessage=%1。%n%n错误 %2: %3
+
-SetupFileMissing=安装目录缺失文件 %1。请更正该问题或获取该问题的新副本。
+; *** 启动错误消息
-SetupFileCorrupt=安装程序文件夹已损坏。请获取该程序的新副本。
+LastErrorMessage=%1.%n%n错误 %2: %3
-SetupFileCorruptOrWrongVer=安装程序文件夹已损坏或与此安装程序版本不兼容。请更正该问题或获取该程序的新副本。
+SetupFileMissing=安装目录中的文件 %1 丢失。请修正这个问题或获取一个新的程序副本。
-InvalidParameter=命令行 %n%n%1 上传递了一个无效参数
+SetupFileCorrupt=安装文件已损坏。请获取一个新的程序副本。
-SetupAlreadyRunning=安装程序已在运行。
+SetupFileCorruptOrWrongVer=安装文件已损坏，或是与这个安装程序的版本不兼容。请修正这个问题或获取新的程序副本。
-WindowsVersionNotSupported=此程序不支持你计算机正运行的 Windows 版本。
+InvalidParameter=无效的命令行参数: %n%n%1
-WindowsServicePackRequired=此程序需要 %1 服务包 %2 或更高版本。
+SetupAlreadyRunning=安装程序正在运行。
-NotOnThisPlatform=此程序将不在 %1 上运行。
+WindowsVersionNotSupported=这个程序不支持该版本的计算机运行。
-OnlyOnThisPlatform=此程序必须在 %1 上运行。
+WindowsServicePackRequired=这个程序要求%1服务包%1或更高。
-OnlyOnTheseArchitectures=此程序仅可安装在为以下处理器体系结构设计的 Windows 版本上:%n%n%1
+NotOnThisPlatform=这个程序将不能运行于 %1。
-MissingWOW64APIs=你正运行的 Windows 版本不包含安装程序执行 64 位安装所需的功能。要更正此问题，请安装服务包 %1。
+OnlyOnThisPlatform=这个程序必须运行于 %1。
-WinVersionTooLowError=此程序需要 %1 版本 %2 或更高版本。
+OnlyOnTheseArchitectures=这个程序只能在为下列处理器结构设计的 Windows 版本中进行安装:%n%n%1
-WinVersionTooHighError=此程序不能安装在 %1 版本 %2 或更高的版本上。
+WinVersionTooLowError=这个程序需要 %1 版本 %2 或更高。
-AdminPrivilegesRequired=在安装此程序时必须作为管理员登录。
+WinVersionTooHighError=这个程序不能安装于 %1 版本 %2 或更高。
-PowerUserPrivilegesRequired=安装此程序时必须以管理员或 Power User 组成员身份登录。
+AdminPrivilegesRequired=在安装这个程序时您必须以管理员身份登录。
-SetupAppRunningError=安装程序检测到 %1 当前正在运行。%n%n请立即关闭它的所有实例，然后单击“确定”以继续，或单击“取消”以退出。
+PowerUserPrivilegesRequired=在安装这个程序时您必须以管理员身份或有权限的用户组身份登录。
-UninstallAppRunningError=卸载检测到 %1 当前正在运行。%n%n请立即关闭它的所有实例，然后单击“确定”以继续或单击“取消”以退出。
+SetupAppRunningError=安装程序发现 %1 当前正在运行。%n%n请先关闭所有运行的窗口，然后单击“确定”继续，或按“取消”退出。
-; *** Misc. errors
+UninstallAppRunningError=卸载程序发现 %1 当前正在运行。%n%n请先关闭所有运行的窗口，然后单击“确定”继续，或按“取消”退出。
-ErrorCreatingDir=安装程序无法创建目录“%1”
+
-ErrorTooManyFilesInDir=无法在目录“%1”中创建文件，因为它包含太多文件
+; *** 启动问题
-; *** Setup common messages
+PrivilegesRequiredOverrideTitle=选择安装程序模式
-ExitSetupTitle=退出安装程序
+PrivilegesRequiredOverrideInstruction=选择安装模式
-ExitSetupMessage=安装程序未完成。如果立即退出，将不会安装该程序。%n%n可在其他时间再次运行安装程序以完成安装。%n%n是否退出安装程序?
+PrivilegesRequiredOverrideText1=%1 可以为所有用户安装(需要管理员权限)，或仅为您安装。
-AboutSetupMenuItem=关于安装程序(&A)...
+PrivilegesRequiredOverrideText2=%1 只能为您安装，或为所有用户安装(需要管理员权限)。
-AboutSetupTitle=关于安装程序
+PrivilegesRequiredOverrideAllUsers=为所有用户安装(&A)
-AboutSetupMessage=%1 版本 %2%n%3%n%n%1 主页:%n%4
+PrivilegesRequiredOverrideAllUsersRecommended=为所有用户安装(建议选项)(&A)
+PrivilegesRequiredOverrideCurrentUser=只为我安装(&M)
+PrivilegesRequiredOverrideCurrentUserRecommended=只为我安装(建议选项)(&M)
+
+; *** 其它错误
+ErrorCreatingDir=安装程序不能创建目录“%1”。
+ErrorTooManyFilesInDir=不能在目录“%1”中创建文件，因为里面的文件太多
+
+; *** 安装程序公共消息
+ExitSetupTitle=退出安装程序
+ExitSetupMessage=安装程序未完成安装。如果您现在退出，您的程序将不能安装。%n%n您可以以后再运行安装程序完成安装。%n%n退出安装程序吗？
+AboutSetupMenuItem=关于安装程序(&A)...
+AboutSetupTitle=关于安装程序
+AboutSetupMessage=%1 版本 %2%n%3%n%n%1 主页:%n%4
 AboutSetupNote=
 TranslatorNote=
-; *** Buttons
+
-ButtonBack=< 上一步(&B)
+; *** 按钮
-ButtonNext=下一步(&N) >
+ButtonBack=< 上一步(&B)
-ButtonInstall=安装(&I)
+ButtonNext=下一步(&N) >
-ButtonOK=确定
+ButtonInstall=安装(&I)
-ButtonCancel=取消
+ButtonOK=确定
-ButtonYes=是(&Y)
+ButtonCancel=取消
-ButtonYesToAll=接受全部(&A)
+ButtonYes=是(&Y)
-ButtonNo=否(&N)
+ButtonYesToAll=全是(&A)
-ButtonNoToAll=否定全部(&O)
+ButtonNo=否(&N)
-ButtonFinish=完成(&F)
+ButtonNoToAll=全否(&O)
-ButtonBrowse=浏览(&B)...
+ButtonFinish=完成(&F)
-ButtonWizardBrowse=浏览(&R)...
+ButtonBrowse=浏览(&B)...
-ButtonNewFolder=新建文件夹(&M)
+ButtonWizardBrowse=浏览(&R)...
-; *** "Select Language" dialog messages
+ButtonNewFolder=新建文件夹(&M)
-SelectLanguageTitle=选择安装程序语言
+
-SelectLanguageLabel=选择安装时要使用的语言:
+; *** “选择语言”对话框消息
-; *** Common wizard text
+SelectLanguageTitle=选择安装语言
-ClickNext=单击“下一步”以继续，或单击“取消”以退出安装程序。
+SelectLanguageLabel=选择安装时要使用的语言。
+
+; *** 公共向导文字
+ClickNext=单击“下一步”继续，或单击“取消”退出安装程序。
 BeveledLabel=
-BrowseDialogTitle=浏览查找文件夹
+BrowseDialogTitle=浏览文件夹
-BrowseDialogLabel=在以下列表中选择一个文件夹，然后单击“确定”。
+BrowseDialogLabel=在下列列表中选择一个文件夹，然后单击“确定”。
-NewFolderName=新建文件夹
+NewFolderName=新建文件夹
-; *** "Welcome" wizard page
+
-WelcomeLabel1=欢迎使用 [name] 安装向导
+; *** “欢迎”向导页
-WelcomeLabel2=这将在计算机上安装 [name/ver]。%n%n建议关闭所有其他应用程序再继续。
+WelcomeLabel1=欢迎使用 [name] 安装向导
-; *** "Password" wizard page
+WelcomeLabel2=现在将安装 [name/ver] 到您的电脑中。%n%n推荐您在继续安装前关闭所有其它应用程序。
-WizardPassword=密码
+
-PasswordLabel1=此安装受密码保护。
+; *** “密码”向导页
-PasswordLabel3=请提供密码，然后单击“下一步”以继续。密码区分大小写。
+WizardPassword=密码
-PasswordEditLabel=密码(&P):
+PasswordLabel1=这个安装程序有密码保护。
-IncorrectPassword=输入的密码不正确。请重试。
+PasswordLabel3=请输入密码，然后单击“下一步”继续。密码区分大小写。
-; *** "License Agreement" wizard page
+PasswordEditLabel=密码(&P):
-WizardLicense=许可协议
+IncorrectPassword=您输入的密码不正确，请重试。
-LicenseLabel=请在继续操作前阅读以下重要信息。
+
-LicenseLabel3=请阅读以下许可协议。必须接受此协议条款才可继续安装。
+; *** “许可协议”向导页
-LicenseAccepted=我接受协议(&A)
+WizardLicense=许可协议
-LicenseNotAccepted=我不接受协议(&D)
+LicenseLabel=继续安装前请阅读下列重要信息。
-; *** "Information" wizard pages
+LicenseLabel3=请仔细阅读下列许可协议。您在继续安装前必须同意这些协议条款。
-WizardInfoBefore=信息
+LicenseAccepted=我同意此协议(&A)
-InfoBeforeLabel=请在继续操作前阅读以下重要信息。
+LicenseNotAccepted=我不同意此协议(&D)
-InfoBeforeClickLabel=准备好继续安装后，单击“下一步”。
+
-WizardInfoAfter=信息
+; *** “信息”向导页
-InfoAfterLabel=请在继续操作前阅读以下重要信息。
+WizardInfoBefore=信息
-InfoAfterClickLabel=准备好继续安装后，单击“下一步”。
+InfoBeforeLabel=请在继续安装前阅读下列重要信息。
-; *** "User Information" wizard page
+InfoBeforeClickLabel=如果您想继续安装，单击“下一步”。
-WizardUserInfo=用户信息
+WizardInfoAfter=信息
-UserInfoDesc=请输入你的信息。
+InfoAfterLabel=请在继续安装前阅读下列重要信息。
-UserInfoName=用户名(&U):
+InfoAfterClickLabel=如果您想继续安装，单击“下一步”。
-UserInfoOrg=组织(&O):
+
-UserInfoSerial=序列号(&S):
+; *** “用户信息”向导页
-UserInfoNameRequired=必须输入名称。
+WizardUserInfo=用户信息
-; *** "Select Destination Location" wizard page
+UserInfoDesc=请输入您的信息。
-WizardSelectDir=选择目标位置
+UserInfoName=用户名(&U):
-SelectDirDesc=应将 [name] 安装到哪里?
+UserInfoOrg=组织(&O):
-SelectDirLabel3=安装程序会将 [name] 安装到以下文件夹。
+UserInfoSerial=序列号(&S):
-SelectDirBrowseLabel=若要继续，单击“下一步”。如果想选择其他文件夹，单击“浏览”。
+UserInfoNameRequired=您必须输入名字。
-DiskSpaceMBLabel=需要至少 [mb] MB 可用磁盘空间。
+
-CannotInstallToNetworkDrive=安装程序无法安装到网络驱动器。
+; *** “选择目标目录”向导面
-CannotInstallToUNCPath=安装程序无法安装到 UNC 路径。
+WizardSelectDir=选择目标位置
-InvalidPath=必须输入带驱动器号的完整路径(例如:%n%nC:\APP%n%n)或以下格式的 UNC 路径:%n%n\\server\share
+SelectDirDesc=您想将 [name] 安装在什么地方？
-InvalidDrive=所选驱动器或 UNC 共享不存在或不可访问。请另外选择。
+SelectDirLabel3=安装程序将安装 [name] 到下列文件夹中。
-DiskSpaceWarningTitle=磁盘空间不足
+SelectDirBrowseLabel=单击“下一步”继续。如果您想选择其它文件夹，单击“浏览”。
-DiskSpaceWarning=安装程序需要至少 %1 KB 可用空间来安装，但所选驱动器仅有 %2 KB 可用空间。%n%n是否仍要继续?
+DiskSpaceGBLabel=至少需要有 [gb] GB 的可用磁盘空间。
-DirNameTooLong=文件夹名称或路径太长。
+DiskSpaceMBLabel=至少需要有 [mb] MB 的可用磁盘空间。
-InvalidDirName=文件夹名称无效。
+CannotInstallToNetworkDrive=安装程序无法安装到一个网络驱动器。
-BadDirName32=文件夹名不能包含以下任一字符:%n%n%1
+CannotInstallToUNCPath=安装程序无法安装到一个UNC路径。
-DirExistsTitle=文件夹存在
+InvalidPath=您必须输入一个带驱动器卷标的完整路径，例如:%n%nC:\APP%n%n或下列形式的 UNC 路径:%n%n\\server\share
-DirExists=文件夹:%n%n%1%n%n已存在。是否仍要安装到该文件夹?
+InvalidDrive=您选定的驱动器或 UNC 共享不存在或不能访问。请选选择其它位置。
-DirDoesntExistTitle=文件夹不存在
+DiskSpaceWarningTitle=没有足够的磁盘空间
-DirDoesntExist=文件夹:%n%n%1%n%n不存在。是否要创建该文件夹?
+DiskSpaceWarning=安装程序至少需要 %1 KB 的可用空间才能安装，但选定驱动器只有 %2 KB 的可用空间。%n%n您一定要继续吗？
-; *** "Select Components" wizard page
+DirNameTooLong=文件夹名或路径太长。
-WizardSelectComponents=选择组件
+InvalidDirName=文件夹名是无效的。
-SelectComponentsDesc=应安装哪些组件?
+BadDirName32=文件夹名不能包含下列任何字符:%n%n%1
-SelectComponentsLabel2=选择希望安装的组件；清除不希望安装的组件。准备就绪后单击“下一步”以继续。
+DirExistsTitle=文件夹存在
-FullInstallation=完全安装
+DirExists=文件夹:%n%n%1%n%n已经存在。您一定要安装到这个文件夹中吗？
+DirDoesntExistTitle=文件夹不存在
+DirDoesntExist=文件夹:%n%n%1%n%n不存在。您想要创建此目录吗？
+
+; *** “选择组件”向导页
+WizardSelectComponents=选择组件
+SelectComponentsDesc=您想安装哪些程序的组件？
+SelectComponentsLabel2=选择您想要安装的组件；清除您不想安装的组件。然后单击“下一步”继续。
+FullInstallation=完全安装
 ; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=简洁安装
+CompactInstallation=简洁安装
-CustomInstallation=自定义安装
+CustomInstallation=自定义安装
-NoUninstallWarningTitle=组件存在
+NoUninstallWarningTitle=组件存在
-NoUninstallWarning=安装程序检测到计算机上已安装以下组件:%n%n%1%n%n取消选择这些组件将不会卸载它们。%n%n是否仍要继续?
+NoUninstallWarning=安装程序侦测到下列组件已在您的电脑中安装。:%n%n%1%n%n取消选定这些组件将不能卸载它们。%n%n您一定要继续吗？
 ComponentSize1=%1 KB
 ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=当前选择需要至少 [mb] MB 磁盘空间。
+ComponentsDiskSpaceGBLabel=当前选择的组件至少需要 [gb] GB 的磁盘空间。
-; *** "Select Additional Tasks" wizard page
+ComponentsDiskSpaceMBLabel=当前选择的组件至少需要 [mb] MB 的磁盘空间。
-WizardSelectTasks=选择其他任务
+
-SelectTasksDesc=应执行哪些其他任务?
+; *** “选择附加任务”向导页
-SelectTasksLabel2=选择安装 [name] 时希望安装程序来执行的其他任务，然后单击“下一步”。
+WizardSelectTasks=选择附加任务
-; *** "Select Start Menu Folder" wizard page
+SelectTasksDesc=您想要安装程序执行哪些附加任务？
-WizardSelectProgramGroup=选择开始菜单文件夹
+SelectTasksLabel2=选择您想要安装程序在安装 [name] 时执行的附加任务，然后单击“下一步”。
-SelectStartMenuFolderDesc=安装程序应将程序的快捷方式放置到哪里?
+
-SelectStartMenuFolderLabel3=安装程序将在以下开始菜单文件夹中创建该程序的快捷方式。
+; *** “选择开始菜单文件夹”向导页
-SelectStartMenuFolderBrowseLabel=若要继续，单击“下一步”。如果想选择其他文件夹，单击“浏览”。
+WizardSelectProgramGroup=选择开始菜单文件夹
-MustEnterGroupName=必须输入文件夹名。
+SelectStartMenuFolderDesc=您想在哪里放置程序的快捷方式？
-GroupNameTooLong=文件夹名称或路径太长。
+SelectStartMenuFolderLabel3=安装程序现在将在下列开始菜单文件夹中创建程序的快捷方式。
-InvalidGroupName=文件夹名称无效。
+SelectStartMenuFolderBrowseLabel=单击“下一步”继续。如果您想选择其它文件夹，单击“浏览”。
-BadGroupName=文件夹名不能保护以下任一字符:%n%n%1
+MustEnterGroupName=您必须输入一个文件夹名。
-NoProgramGroupCheck2=不创建开始菜单文件夹(&D)
+GroupNameTooLong=文件夹名或路径太长。
-; *** "Ready to Install" wizard page
+InvalidGroupName=文件夹名是无效的。
-WizardReady=安装准备就绪
+BadGroupName=文件夹名不能包含下列任何字符:%n%n%1
-ReadyLabel1=安装程序现已准备好在计算机上安装 [name]。
+NoProgramGroupCheck2=不创建开始菜单文件夹(&D)
-ReadyLabel2a=单击“安装”以继续安装，如想查看或更改任何设置则单击"返回"。
+
-ReadyLabel2b=单击“安装”以继续安装。
+; *** “准备安装”向导页
-ReadyMemoUserInfo=用户信息:
+WizardReady=准备安装
-ReadyMemoDir=目标位置:
+ReadyLabel1=安装程序现在准备开始安装 [name] 到您的电脑中。
-ReadyMemoType=安装程序类型:
+ReadyLabel2a=单击“安装”继续此安装程序。如果您想要回顾或改变设置，请单击“上一步”。
-ReadyMemoComponents=所选组件:
+ReadyLabel2b=单击“安装”继续此安装程序?
-ReadyMemoGroup=开始菜单文件夹:
+ReadyMemoUserInfo=用户信息:
-ReadyMemoTasks=其他任务:
+ReadyMemoDir=目标位置:
-; *** "Preparing to Install" wizard page
+ReadyMemoType=安装类型:
-WizardPreparing=正在准备安装
+ReadyMemoComponents=选定组件:
-PreparingDesc=安装程序正准备在计算机上安装 [name]。
+ReadyMemoGroup=开始菜单文件夹:
-PreviousInstallNotCompleted=上一个程序的安装/删除未完成。需重启计算机以完成该安装。%n%n重启计算机后，重新运行安装程序以完成 [name] 的安装。
+ReadyMemoTasks=附加任务:
-CannotContinue=安装程序无法继续。请单击"取消"以退出。
+
-ApplicationsFound=以下应用程序正在使用需要通过安装程序进行更新的文件。建议允许安装程序自动关闭这些应用程序。
+; *** “正在准备安装”向导页
-ApplicationsFound2=以下应用程序正在使用需要通过安装程序进行更新的文件。建议允许安装程序自动关闭这些应用程序。完成安装后，安装程序将尝试重启应用程序。
+WizardPreparing=正在准备安装
-CloseApplications=自动关闭应用程序(&A)
+PreparingDesc=安装程序正在准备安装 [name] 到您的电脑中。
-DontCloseApplications=不关闭应用程序(&D)
+PreviousInstallNotCompleted=先前程序的安装/卸载未完成。您需要重新启动您的电脑才能完成安装。%n%n在重新启动电脑后，再运行安装完成 [name] 的安装。
-ErrorCloseApplications=安装程序无法自动关闭所有应用程序。建议在继续操作之前先关闭所有使用需通过安装程序进行更新的文件的应用程序。
+CannotContinue=安装程序不能继续。请单击“取消”退出。
-; *** "Installing" wizard page
+ApplicationsFound=下列应用程序正在使用的文件需要更新设置。它是建议您允许安装程序自动关闭这些应用程序。
-WizardInstalling=正在安装
+ApplicationsFound2=下列应用程序正在使用的文件需要更新设置。它是建议您允许安装程序自动关闭这些应用程序。安装完成后，安装程序将尝试重新启动应用程序。
-InstallingLabel=安装程序正在计算机上安装 [name]，请稍等。
+CloseApplications=自动关闭该应用程序(&A)
-; *** "Setup Completed" wizard page
+DontCloseApplications=不要关闭该应用程序(D)
-FinishedHeadingLabel=完成 [name] 安装向导
+ErrorCloseApplications=安装程序无法自动关闭所有应用程序。在继续之前，我们建议您关闭所有使用需要更新的安装程序文件。
-FinishedLabelNoIcons=安装程序已在计算机上完成安装 [name]。
+PrepareToInstallNeedsRestart=安装程序必须重新启动计算机。重新启动计算机后，请再次运行安装程序以完成 [name] 的安装。%n%n是否立即重新启动？
-FinishedLabel=安装程序已在计算机上完成安装 [name]。通过选择安装的快捷方式可以启动该应用程序。
+
-ClickFinish=单击“完成”以退出安装程序。
+; *** “正在安装”向导页
-FinishedRestartLabel=要完成 [name] 的安装，安装程序必须重启计算机。是否要立即重启?
+WizardInstalling=正在安装
-FinishedRestartMessage=要完成 [name] 的安装，安装程序必须重启计算机。%n%n是否要立即重启?
+InstallingLabel=安装程序正在安装 [name] 到您的电脑中，请稍等。
-ShowReadmeCheck=是，我希望查看 README 文件
+
-YesRadio=是，立即重启计算机(&Y)
+; *** “安装完成”向导页
-NoRadio=否，我将稍后重启计算机(&N)
+FinishedHeadingLabel=[name] 安装完成
-; used for example as 'Run MyProg.exe'
+FinishedLabelNoIcons=安装程序已在您的电脑中安装了 [name]。
-RunEntryExec=运行 %1
+FinishedLabel=安装程序已在您的电脑中安装了 [name]。此应用程序可以通过选择安装的快捷方式运行。
-; used for example as 'View Readme.txt'
+ClickFinish=单击“完成”退出安装程序。
-RunEntryShellExec=查看 %1
+FinishedRestartLabel=要完成 [name] 的安装，安装程序必须重新启动您的电脑。您想现在重新启动吗？
-; *** "Setup Needs the Next Disk" stuff
+FinishedRestartMessage=要完成 [name] 的安装，安装程序必须重新启动您的电脑。%n%n您想现在重新启动吗？
-ChangeDiskTitle=安装程序需要下一个磁盘
+ShowReadmeCheck=是，您想查阅自述文件
-SelectDiskLabel2=请插入磁盘 %1 并点击“确定”。%n%n如果此磁盘上的文件可在以下文件夹外的其他文件夹中找到，请输入正确路径或单击“浏览”。
+YesRadio=是，立即重新启动电脑(&Y)
-PathLabel=路径(&P):
+NoRadio=否，稍后重新启动电脑(&N)
-FileNotInDir2=在“%2”中无法定位文件“%1”。请插入正确的磁盘或选择其他文件夹。
+; 用于象“运行 MyProg.exe”
-SelectDirectoryLabel=请指定下一个磁盘的位置。
+RunEntryExec=运行 %1
-; *** Installation phase messages
+; 用于象“查阅 Readme.txt”
-SetupAborted=安装程序未完成。%n%n请更正问题并重新运行安装程序。
+RunEntryShellExec=查阅 %1
-EntryAbortRetryIgnore=单击“重试”以再次尝试，单击“忽略”以继续，或单击“中止”以取消安装。
+
-; *** Installation status messages
+; *** “安装程序需要下一张磁盘”提示
-StatusClosingApplications=正在关闭应用程序...
+ChangeDiskTitle=安装程序需要下一张磁盘
-StatusCreateDirs=正在创建目录...
+SelectDiskLabel2=请插入磁盘 %1 并单击“确定”。%n%n如果这个磁盘中的文件不能在不同于下列显示的文件夹中找到，输入正确的路径或单击“浏览”。
-StatusExtractFiles=正在解压缩文件...
+PathLabel=路径(&P):
-StatusCreateIcons=正在创建快捷方式...
+FileNotInDir2=文件“%1”不能在“%2”定位。请插入正确的磁盘或选择其它文件夹。
-StatusCreateIniEntries=正在创建 INI 项...
+SelectDirectoryLabel=请指定下一张磁盘的位置。
-StatusCreateRegistryEntries=正在创建注册表项...
+
-StatusRegisterFiles=正在注册文件...
+; *** 安装状态消息
-StatusSavingUninstall=正在保存卸载信息...
+SetupAborted=安装程序未完成安装。%n%n请修正这个问题并重新运行安装程序。
-StatusRunProgram=正在完成安装...
+AbortRetryIgnoreSelectAction=选项
-StatusRestartingApplications=正在重启应用程序...
+AbortRetryIgnoreRetry=重试(&T)
-StatusRollback=正在回退更改...
+AbortRetryIgnoreIgnore=忽略错误并继续(&I)
-; *** Misc. errors
+AbortRetryIgnoreCancel=关闭安装程序
-ErrorInternal2=内部错误: %1
+
-ErrorFunctionFailedNoCode=%1 失败
+; *** 安装状态消息
-ErrorFunctionFailed=%1 失败；代码 %2
+StatusClosingApplications=正在关闭应用程序...
-ErrorFunctionFailedWithMessage=%1 失败；代码 %2。%n%3
+StatusCreateDirs=正在创建目录...
-ErrorExecutingProgram=无法执行文件:%n%1
+StatusExtractFiles=正在解压缩文件...
-; *** Registry errors
+StatusCreateIcons=正在创建快捷方式...
-ErrorRegOpenKey=打开注册表项时出错:%n%1\%2
+StatusCreateIniEntries=正在创建 INI 条目...
-ErrorRegCreateKey=创建注册表项时出错:%n%1\%2
+StatusCreateRegistryEntries=正在创建注册表条目...
-ErrorRegWriteKey=写入注册表项时出错:%n%1\%2
+StatusRegisterFiles=正在注册文件...
-; *** INI errors
+StatusSavingUninstall=正在保存卸载信息...
-ErrorIniEntry=在文件“%1”中创建 INI 项时出错。
+StatusRunProgram=正在完成安装...
-; *** File copying errors
+StatusRestartingApplications=正在重启应用程序...
-FileAbortRetryIgnore=单击“重试”以再次操作，单击“忽略”以跳过此文件(不建议此操作)，或单击“中止”以取消安装。
+StatusRollback=正在撤销更改...
-FileAbortRetryIgnore2=单击“重试”以再次操作，单击“忽略”以继续(不建议此操作)，或单击“中止”以取消安装。
+
-SourceIsCorrupted=源文件已损坏
+; *** 其它错误
-SourceDoesntExist=源文件“%1”不存在
+ErrorInternal2=内部错误: %1
-ExistingFileReadOnly=现有文件被标记为只读状态。%n%n单击“重试”以删除只读特性并重试，单击“忽略”以跳过此文件，或单击“中止”以取消安装。
+ErrorFunctionFailedNoCode=%1 失败
-ErrorReadingExistingDest=尝试读取现有文件时出错:
+ErrorFunctionFailed=%1 失败；错误代码 %2
-FileExists=该文件已存在。%n%n是否要安装程序覆盖它?
+ErrorFunctionFailedWithMessage=%1 失败；错误代码 %2.%n%3
-ExistingFileNewer=现有文件比安装程序正尝试安装的文件更新。建议保留现有文件。%n%n是否要保留现有文件?
+ErrorExecutingProgram=不能执行文件:%n%1
-ErrorChangingAttr=尝试更改现有文件特性出错:
+
-ErrorCreatingTemp=尝试在目标目录创建文件时出错:
+; *** 注册表错误
-ErrorReadingSource=尝试读取源文件时出错:
+ErrorRegOpenKey=打开注册表项时出错:%n%1\%2
-ErrorCopying=尝试复制文件时出错:
+ErrorRegCreateKey=创建注册表项时出错:%n%1\%2
-ErrorReplacingExistingFile=尝试替换现有文件时出错:
+ErrorRegWriteKey=写入注册表项时出错:%n%1\%2
-ErrorRestartReplace=RestartReplace 失败:
+
-ErrorRenamingTemp=尝试在目标目录重命名文件时出错:
+; *** INI 错误
-ErrorRegisterServer=无法注册 DLL/OCX: %1
+ErrorIniEntry=在文件“%1”创建 INI 项目错误。
-ErrorRegSvr32Failed=RegSvr32 失败，退出代码为 %1
+
-ErrorRegisterTypeLib=无法注册类型库: %1
+; *** 文件复制错误
-; *** Post-installation errors
+FileAbortRetryIgnoreSkipNotRecommended=跳过这个文件 (不推荐)(&S)
-ErrorOpeningReadme=尝试打开 README 文件时出错。
+FileAbortRetryIgnoreIgnoreNotRecommended=忽略错误并继续 (不推荐)(&I)
-ErrorRestartingComputer=安装程序无法重启计算机。请手动执行此操作。
+SourceIsCorrupted=源文件已损坏
-; *** Uninstaller messages
+SourceDoesntExist=源文件“%1”不存在
-UninstallNotFound=文件“%1”不存在。无法安装。
+ExistingFileReadOnly2=无法替换现有文件，因为它是只读的。
-UninstallOpenError=无法打开文件“%1”。无法卸载
+ExistingFileReadOnlyRetry=移除只读属性并重试(&R)
-UninstallUnsupportedVer=卸载日志“%1”的格式无法被此版本的卸载程序识别。无法卸载
+ExistingFileReadOnlyKeepExisting=保留现有文件(&K)
-UninstallUnknownEntry=卸载日志中发现未知条目(%1)
+ErrorReadingExistingDest=尝试读取现有文件时发生一个错误:
-ConfirmUninstall=确定要彻底删除 %1 和及其全部组件?
+FileExists=文件已经存在。%n%n您想要安装程序覆盖它吗？
-UninstallOnlyOnWin64=仅可在 64 位 Windows 上卸载此安装。
+ExistingFileNewer=现有的文件新与安装程序要安装的文件。推荐您保留现有文件。%n%n您想要保留现有的文件吗？
-OnlyAdminCanUninstall=仅具有管理权限的用户才可卸载此安装。
+ErrorChangingAttr=尝试改变下列现有的文件的属性时发生一个错误:
-UninstallStatusLabel=正从计算机删除 %1，请稍等。
+ErrorCreatingTemp=尝试在目标目录创建文件时发生一个错误:
-UninstalledAll=已成功从计算机上删除 %1。
+ErrorReadingSource=尝试读取下列源文件时发生一个错误:
-UninstalledMost=%1 卸载完成。%n%n无法删除一些元素。可将其手动删除。
+ErrorCopying=尝试复制下列文件时发生一个错误:
-UninstalledAndNeedsRestart=要完成 %1 的卸载，必须重启计算机。%n%n是否要立即重启?
+ErrorReplacingExistingFile=尝试替换现有的文件时发生错误:
-UninstallDataCorrupted=“%1”文件已损坏。无法卸载
+ErrorRestartReplace=重启电脑后替换文件失败:
-; *** Uninstallation phase messages
+ErrorRenamingTemp=尝试重新命名以下目标目录中的一个文件时发生错误:
-ConfirmDeleteSharedFileTitle=删除共享文件?
+ErrorRegisterServer=不能注册 DLL/OCX: %1
-ConfirmDeleteSharedFile2=系统表示以下共享文件不再被任何程序使用。是否要卸载删除此共享文件?%n%n如果在有程序仍在使用此文件而它被删除，则程序可能不会正常运行。如果不确定，请选择“否”。将文件留住系统上不会造成任何问题。
+ErrorRegSvr32Failed=RegSvr32 失败；退出代码 %1
-SharedFileNameLabel=文件名:
+ErrorRegisterTypeLib=不能注册类型库: %1
-SharedFileLocationLabel=位置:
+
-WizardUninstalling=卸载状态
+; *** 卸载显示名字标记
-StatusUninstalling=正在卸载 %1...
+; used for example as 'My Program (32-bit)'
+UninstallDisplayNameMark=%1 (%2)
+; used for example as 'My Program (32-bit, All users)'
+UninstallDisplayNameMarks=%1 (%2, %3)
+UninstallDisplayNameMark32Bit=32位
+UninstallDisplayNameMark64Bit=64位
+UninstallDisplayNameMarkAllUsers=所有用户
+UninstallDisplayNameMarkCurrentUser=当前用户
+
+; *** 安装后错误
+ErrorOpeningReadme=当尝试打开自述文件时发生一个错误。
+ErrorRestartingComputer=安装程序不能重新启动电脑，请手动重启。
+
+; *** 卸载消息
+UninstallNotFound=文件“%1”不存在。不能卸载。
+UninstallOpenError=文件“%1”不能打开。不能卸载。
+UninstallUnsupportedVer=卸载日志文件“%1”有未被这个版本的卸载器承认的格式。不能卸载
+UninstallUnknownEntry=在卸载日志中遇到一个未知的条目 (%1)
+ConfirmUninstall=您确认想要完全删除 %1 及它的所有组件吗？
+UninstallOnlyOnWin64=这个安装程序只能在 64 位 Windows 中进行卸载。
+OnlyAdminCanUninstall=这个安装的程序只能是有管理员权限的用户才能卸载。
+UninstallStatusLabel=正在从您的电脑中删除 %1，请等待。
+UninstalledAll=%1 已顺利地从您的电脑中删除。
+UninstalledMost=%1 卸载完成。%n%n有一些内容不能被删除。您可以手工删除它们。
+UninstalledAndNeedsRestart=要完成 %1 的卸载，您的电脑必须重新启动。%n%n您现在想重新启动电脑吗？
+UninstallDataCorrupted=“%1”文件被破坏，不能卸载
+
+; *** 卸载状态消息
+ConfirmDeleteSharedFileTitle=删除共享文件吗？
+ConfirmDeleteSharedFile2=系统中包含的下列共享文件已经不被其它程序使用。您想要卸载程序删除这些共享文件吗？%n%n如果这些文件被删除，但还有程序正在使用这些文件，这些程序可能不能正确执行。如果您不能确定，选择“否”。把这些文件保留在系统中以免引起问题。
+SharedFileNameLabel=文件名:
+SharedFileLocationLabel=位置:
+WizardUninstalling=卸载状态
+StatusUninstalling=正在卸载 %1...
+
 ; *** Shutdown block reasons
-ShutdownBlockReasonInstallingApp=正在安装 %1。
+ShutdownBlockReasonInstallingApp=正在安装 %1.
-ShutdownBlockReasonUninstallingApp=正在卸载 %1。
+ShutdownBlockReasonUninstallingApp=正在卸载 %1.
+
 ; The custom messages below aren't used by Setup itself, but if you make
 ; use of them in your scripts, you'll want to translate them.
+
 [CustomMessages]
-NameAndVersion=%1 版本 %2
+
-AdditionalIcons=其他快捷方式:
+NameAndVersion=%1 版本 %2
-CreateDesktopIcon=创建桌面快捷方式(&D)
+AdditionalIcons=附加快捷方式:
-CreateQuickLaunchIcon=创建快速启动快捷方式(&Q)
+CreateDesktopIcon=创建桌面快捷方式(&D)
-ProgramOnTheWeb=Web 上的 %1
+CreateQuickLaunchIcon=创建快速运行栏快捷方式(&Q)
-UninstallProgram=卸载 %1
+ProgramOnTheWeb=%1 网站
-LaunchProgram=启动 %1
+UninstallProgram=卸载 %1
-AssocFileExtension=将 %1 与 %2 文件扩展名关联(&A)
+LaunchProgram=运行 %1
-AssocingFileExtension=正将 %1 与 %2 文件扩展名关联...
+AssocFileExtension=将 %2 文件扩展名与 %1 建立关联(&A)
-AutoStartProgramGroupDescription=启动:
+AssocingFileExtension=正在将 %2 文件扩展名与 %1 建立关联...
-AutoStartProgram=自动启动 %1
+AutoStartProgramGroupDescription=启动组:
-AddonHostProgramNotFound=无法在所选文件夹中定位 %1。%n%n是否仍要继续?
+AutoStartProgram=自动启动 %1
+AddonHostProgramNotFound=%1无法找到您所选择的文件夹。%n%n您想要继续吗？
+

build/win32/i18n/Default.zh-tw.isl

@@ -1,298 +1,359 @@
-; *** Inno Setup version 5.5.3+ Traditional Chinese messages ***
+; *** Inno Setup version 6.0.0+ Chinese Traditional messages ***
 ;
-; To download user-contributed translations of this file, go to:
+; Name: John Wu, mr.johnwu@gmail.com
-;   http://www.jrsoftware.org/files/istrans/
+; Base on 5.5.3+ translations by Samuel Lee, Email: 751555749@qq.com
+; Translation based on network resource
 ;
-; Note: When translating this text, do not add periods (.) to the end of
+
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
 [LangOptions]
 ; The following three entries are very important. Be sure to read and 
 ; understand the '[LangOptions] section' topic in the help file.
-LanguageName=Traditional Chinese
+; If Language Name display incorrect, uncomment next line
+LanguageName=<7e41><9ad4><4e2d><6587>
 LanguageID=$0404
-LanguageCodePage=950
+LanguageCodepage=950
 ; If the language you are translating to requires special font faces or
 ; sizes, uncomment any of the following entries and change them accordingly.
-;DialogFontName=
+DialogFontName=新細明體
-;DialogFontSize=8
+DialogFontSize=9
-;WelcomeFontName=Verdana
+TitleFontName=Arial
-;WelcomeFontSize=12
+TitleFontSize=28
-;TitleFontName=Arial
+WelcomeFontName=新細明體
-;TitleFontSize=29
+WelcomeFontSize=12
-;CopyrightFontName=Arial
+CopyrightFontName=新細明體
-;CopyrightFontSize=8
+CopyrightFontSize=9
+
 [Messages]
+
 ; *** Application titles
-SetupAppTitle=安裝程式
+SetupAppTitle=安裝程式
-SetupWindowTitle=安裝程式 - %1
+SetupWindowTitle=%1 安裝程式
-UninstallAppTitle=解除安裝
+UninstallAppTitle=解除安裝
-UninstallAppFullTitle=%1 解除安裝
+UninstallAppFullTitle=解除安裝 %1
+
 ; *** Misc. common
-InformationTitle=資訊
+InformationTitle=訊息
-ConfirmTitle=確認
+ConfirmTitle=確認
-ErrorTitle=錯誤
+ErrorTitle=錯誤
+
 ; *** SetupLdr messages
-SetupLdrStartupMessage=這會安裝 %1。要繼續嗎?
+SetupLdrStartupMessage=這將會安裝 %1。您想要繼續嗎?
-LdrCannotCreateTemp=無法建立暫存檔。安裝已中止
+LdrCannotCreateTemp=無法建立暫存檔案。安裝程式將會結束。
-LdrCannotExecTemp=無法執行暫存目錄中的檔案。安裝已中止
+LdrCannotExecTemp=無法執行暫存檔案。安裝程式將會結束。
+HelpTextNote=
+
 ; *** Startup error messages
-LastErrorMessage=%1。%n%n錯誤 %2: %3
+LastErrorMessage=%1%n%n錯誤 %2: %3
-SetupFileMissing=安裝目錄中缺少檔案 %1。請修正問題，或重新取得程式的新複本。
+SetupFileMissing=安裝資料夾中遺失檔案 %1。請修正此問題或重新取得此軟體。
-SetupFileCorrupt=安裝程式檔案已損毀。請重新取得該程式的複本。
+SetupFileCorrupt=安裝檔案已經損毀。請重新取得此軟體。
-SetupFileCorruptOrWrongVer=安裝程式檔案已損毀，或不相容於與此版的安裝程式。請修正問題，或重新取得程式的新複本。
+SetupFileCorruptOrWrongVer=安裝檔案已經損毀，或與安裝程式的版本不符。請重新取得此軟體。
-InvalidParameter=在命令列上傳遞了無效的參數:%n%n%1
+InvalidParameter=某個無效的變量已被傳遞到了命令列:%n%n%1
-SetupAlreadyRunning=安裝程式已在執行中。
+SetupAlreadyRunning=安裝程式已經在執行。
-WindowsVersionNotSupported=此程式不支援電腦所執行的 Windows 版本。
+WindowsVersionNotSupported=本安裝程式並不支援目前在電腦所運行的 Windows 版本。
-WindowsServicePackRequired=此程式需要 %1 Service Pack %2 或更新版本。
+WindowsServicePackRequired=本安裝程式需要 %1 Service Pack %2 或更新。
-NotOnThisPlatform=此程式不會在 %1 上執行。
+NotOnThisPlatform=這個程式無法在 %1 執行。
-OnlyOnThisPlatform=此程式必須在 %1 上執行。
+OnlyOnThisPlatform=這個程式必須在 %1 執行。
-OnlyOnTheseArchitectures=此程式只可安裝在專為下列處理器架構設計的 Windows 版本上:%n%n%1
+OnlyOnTheseArchitectures=這個程式只能在專門為以下處理器架構而設計的 Windows 上安裝:%n%n%1
-MissingWOW64APIs=您執行的 Windows 版本不含安裝程式執行 64 位元安裝所需的功能。若要修正此問題，請安裝 Service Pack %1。
+WinVersionTooLowError=這個程式必須在 %1 版本 %2 或以上的系統執行。
-WinVersionTooLowError=此程式需要 %1 版 %2 或更新版本。
+WinVersionTooHighError=這個程式無法安裝在 %1 版本 %2 或以上的系統。
-WinVersionTooHighError=此程式無法安裝在 %1 版 %2 或更新版本上。
+AdminPrivilegesRequired=您必須登入成系統管理員以安裝這個程式。
-AdminPrivilegesRequired=安裝此程式時，必須以系統管理員身分登入。
+PowerUserPrivilegesRequired=您必須登入成具有系統管理員或 Power User 權限的使用者以安裝這個程式。
-PowerUserPrivilegesRequired=當您安裝此程式時，必須以系統管理員或 Power Users 群組的成員身分登入。
+SetupAppRunningError=安裝程式偵測到 %1 正在執行。%n%n請關閉該程式後按 [確定] 繼續，或按 [取消] 離開。
-SetupAppRunningError=安裝時偵測到 %1 目前正在執行中。%n%n請立即關閉其所有執行個體。若要繼續，請按一下 [確定]; 若要結束，請按一下 [取消]。
+UninstallAppRunningError=解除安裝程式偵測到 %1 正在執行。%n%n請關閉該程式後按 [確定] 繼續，或按 [取消] 離開。
-UninstallAppRunningError=解除安裝時偵測到 %1 目前正在執行中。%n%n請立即關閉其所有執行個體。若要繼續，請按一下 [確定]; 若要結束，請按一下 [取消]。
+
+; *** Startup questions
+PrivilegesRequiredOverrideTitle=選擇安裝程式安裝模式
+PrivilegesRequiredOverrideInstruction=選擇安裝模式
+PrivilegesRequiredOverrideText1=可以為所有使用者安裝 %1 (需要系統管理權限)，或是僅為您安裝。
+PrivilegesRequiredOverrideText2=可以僅為您安裝 %1，或是為所有使用者安裝 (需要系統管理權限)。
+PrivilegesRequiredOverrideAllUsers=為所有使用者安裝 (&A)
+PrivilegesRequiredOverrideAllUsersRecommended=為所有使用者安裝 (建議選項) (&A)
+PrivilegesRequiredOverrideCurrentUser=僅為我安裝 (&M)
+PrivilegesRequiredOverrideCurrentUserRecommended=僅為我安裝 (建議選項) (&M)
+
 ; *** Misc. errors
-ErrorCreatingDir=安裝程式無法建立目錄 "%1"
+ErrorCreatingDir=安裝程式無法建立資料夾“%1”。
-ErrorTooManyFilesInDir=因為目錄 "%1" 包含太多檔案，所以無法在其中建立檔案
+ErrorTooManyFilesInDir=無法在資料夾“%1”內建立檔案，因為資料夾內有太多的檔案。
+
 ; *** Setup common messages
-ExitSetupTitle=結束安裝
+ExitSetupTitle=結束安裝程式
-ExitSetupMessage=安裝未完成。若立即結束，將不會安裝程式。%n%n您可以稍後再執行安裝程式來完成安裝。%n%n要結束安裝嗎?
+ExitSetupMessage=安裝尚未完成。如果您現在結束安裝程式，這個程式將不會被安裝。%n%n您可以稍後再執行安裝程式以完成安裝程序。您現在要結束安裝程式嗎?
-AboutSetupMenuItem=關於安裝程式(&A)...
+AboutSetupMenuItem=關於安裝程式(&A)...
-AboutSetupTitle=關於安裝程式
+AboutSetupTitle=關於安裝程式
-AboutSetupMessage=%1 版 %2%n%3%n%n%1 首頁:%n%4
+AboutSetupMessage=%1 版本 %2%n%3%n%n%1 網址:%n%4
 AboutSetupNote=
 TranslatorNote=
+
 ; *** Buttons
-ButtonBack=< 上一步(&B)
+ButtonBack=< 上一步(&B)
-ButtonNext=下一步(&N) >
+ButtonInstall=安裝(&I)
-ButtonInstall=安裝(&I)
+ButtonNext=下一步(&N)  >
-ButtonOK=確定
+ButtonOK=確定
-ButtonCancel=取消
+ButtonCancel=取消
-ButtonYes=是(&Y)
+ButtonYes=是(&Y)
-ButtonYesToAll=全部皆是(&A)
+ButtonYesToAll=全部皆是(&A)
-ButtonNo=否(&N)
+ButtonNo=否(&N)
-ButtonNoToAll=全部皆否(&O)
+ButtonNoToAll=全部皆否(&O)
-ButtonFinish=完成(&F)
+ButtonFinish=完成(&F)
-ButtonBrowse=瀏覽(&B)...
+ButtonBrowse=瀏覽(&B)...
-ButtonWizardBrowse=瀏覽(&R)...
+ButtonWizardBrowse=瀏覽(&R)...
-ButtonNewFolder=建立新資料夾(&M)
+ButtonNewFolder=建立新資料夾(&M)
+
 ; *** "Select Language" dialog messages
-SelectLanguageTitle=選取安裝程式語言
+SelectLanguageTitle=選擇安裝語言
-SelectLanguageLabel=選取安裝期間所要使用的語言:
+SelectLanguageLabel=選擇在安裝過程中使用的語言:
+
 ; *** Common wizard text
-ClickNext=若要繼續，請按一下 [下一步]; 若要結束安裝，請按一下 [取消]。
+ClickNext=按 [下一步] 繼續安裝，或按 [取消] 結束安裝程式。
 BeveledLabel=
-BrowseDialogTitle=瀏覽資料夾
+BrowseDialogTitle=瀏覽資料夾
-BrowseDialogLabel=請從下列清單中選取資料夾，然後按一下 [確定]。
+BrowseDialogLabel=在下面的資料夾列表中選擇一個資料夾，然後按 [確定]。
-NewFolderName=新增資料夾
+NewFolderName=新資料夾
+
 ; *** "Welcome" wizard page
-WelcomeLabel1=歡迎使用 [name] 安裝精靈
+WelcomeLabel1=歡迎使用 [name] 安裝程式
-WelcomeLabel2=這會在您的電腦上安裝 [name/ver]。%n%n建議您先關閉所有其他應用程式，然後再繼續。
+WelcomeLabel2=這個安裝程式將會安裝 [name/ver] 到您的電腦。%n%n我們強烈建議您在安裝過程中關閉其它的應用程式，以避免與安裝程式發生沖突。
+
 ; *** "Password" wizard page
-WizardPassword=密碼
+WizardPassword=密碼
-PasswordLabel1=此安裝受密碼保護。
+PasswordLabel1=這個安裝程式具有密碼保護。
-PasswordLabel3=請提供密碼，然後按一下 [下一步] 以繼續。密碼區分大小寫。
+PasswordLabel3=請輸入密碼，然後按 [下一步] 繼續。密碼是區分大小寫的。
-PasswordEditLabel=密碼(&P):
+PasswordEditLabel=密碼(&P):
-IncorrectPassword=輸入的密碼不正確。請再試一次。
+IncorrectPassword=您輸入的密碼不正確，請重新輸入。
+
 ; *** "License Agreement" wizard page
-WizardLicense=授權合約
+WizardLicense=授權合約
-LicenseLabel=請先閱讀下列重要資訊再繼續。
+LicenseLabel=請閱讀以下授權合約。
-LicenseLabel3=請閱讀下列授權合約。您必須接受此合約條款，才能繼續安裝。
+LicenseLabel3=請閱讀以下授權合約，您必須接受合約的各項條款才能繼續安裝。
-LicenseAccepted=我接受合約(&A)
+LicenseAccepted=我同意(&A)
-LicenseNotAccepted=我不接受合約(&D)
+LicenseNotAccepted=我不同意(&D)
+
 ; *** "Information" wizard pages
-WizardInfoBefore=資訊
+WizardInfoBefore=訊息
-InfoBeforeLabel=請先閱讀下列重要資訊再繼續。
+InfoBeforeLabel=在繼續安裝之前請閱讀以下重要資訊。
-InfoBeforeClickLabel=當您準備好要繼續安裝時，請按一下 [下一步]。
+InfoBeforeClickLabel=當您準備好繼續安裝，請按 [下一步]。
-WizardInfoAfter=資訊
+WizardInfoAfter=訊息
-InfoAfterLabel=請先閱讀下列重要資訊再繼續。
+InfoAfterLabel=在繼續安裝之前請閱讀以下重要資訊。
-InfoAfterClickLabel=當您準備好要繼續安裝時，請按一下 [下一步]。
+InfoAfterClickLabel=當您準備好繼續安裝，請按 [下一步]。
+
 ; *** "User Information" wizard page
-WizardUserInfo=使用者資訊
+WizardUserInfo=使用者資訊
-UserInfoDesc=請輸入您的資訊。
+UserInfoDesc=請輸入您的資料。
-UserInfoName=使用者名稱(&U):
+UserInfoName=使用者名稱(&U):
-UserInfoOrg=組織(&O):
+UserInfoOrg=組織(&O):
-UserInfoSerial=序號(&S):
+UserInfoSerial=序號(&S):
-UserInfoNameRequired=必須輸入名稱。
+UserInfoNameRequired=您必須輸入您的名稱。
+
 ; *** "Select Destination Location" wizard page
-WizardSelectDir=選取目的地位置
+WizardSelectDir=選擇目的資料夾
-SelectDirDesc=應將 [name] 安裝在何處?
+SelectDirDesc=選擇安裝程式安裝 [name] 的位置。
-SelectDirLabel3=安裝程式會將 [name] 安裝在下列資料夾中。
+SelectDirLabel3=安裝程式將會把 [name] 安裝到下面的資料夾。
-SelectDirBrowseLabel=若要繼續，請按一下 [下一步]。若您想選取不同的資料夾，請按一下 [瀏覽]。
+SelectDirBrowseLabel=按 [下一步] 繼續，如果您想選擇另一個資料夾，請按 [瀏覽]。
-DiskSpaceMBLabel=至少須有 [mb] MB 的可用磁碟空間。
+DiskSpaceMBLabel=最少需要 [mb] MB 磁碟空間。
-CannotInstallToNetworkDrive=安裝程式無法安裝到網路磁碟機。
+CannotInstallToNetworkDrive=安裝程式無法安裝於網絡磁碟機。
-CannotInstallToUNCPath=安裝程式無法安裝到 UNC 路徑。
+CannotInstallToUNCPath=安裝程式無法安裝於 UNC 路徑。
-InvalidPath=必須輸入包含磁碟機代號的完整路徑，例如:%n%nC:\APP%n%n或輸入下列格式的 UNC 路徑:%n%n\\伺服器\共用
+InvalidPath=您必須輸入完整的路徑名稱及磁碟機代碼。%n%n例如 C:\App 或 UNC 路徑格式 \\伺服器\共用資料夾。
-InvalidDrive=選取的磁碟機或 UNC 共用不存在或無法存取。請選取其他磁碟機或 UNC 共用。
+InvalidDrive=您選取的磁碟機或 UNC 名稱不存在或無法存取，請選擇其他的目的地。
-DiskSpaceWarningTitle=磁碟空間不足
+DiskSpaceWarningTitle=磁碟空間不足
-DiskSpaceWarning=安裝程式至少需要 %1 KB 的可用空間才能安裝，但所選磁碟機的可用空間只有 %2 KB。%n%n仍要繼續嗎?
+DiskSpaceWarning=安裝程式需要至少 %1 KB 的磁碟空間，您所選取的磁碟只有 %2 KB 可用空間。%n%n您要繼續安裝嗎?
-DirNameTooLong=資料夾名稱或路徑過長。
+DirNameTooLong=資料夾名稱或路徑太長。
-InvalidDirName=此資料夾名稱無效。
+InvalidDirName=資料夾名稱不正確。
-BadDirName32=資料夾名稱不得包含下列任一字元:%n%n%1
+BadDirName32=資料夾名稱不得包含以下特殊字元:%n%n%1
-DirExistsTitle=資料夾已存在
+DirExistsTitle=資料夾已經存在
-DirExists=已有資料夾 %n%n%1%n%n。仍要安裝到該資料夾嗎?
+DirExists=資料夾：%n%n%1%n%n 已經存在。仍要安裝到該資料夾嗎？
-DirDoesntExistTitle=資料夾不存在
+DirDoesntExistTitle=資料夾不存在
-DirDoesntExist=資料夾 %n%n%1%n%n 不存在。要建立該資料夾嗎?
+DirDoesntExist=資料夾：%n%n%1%n%n 不存在。要建立該資料夾嗎？
+
 ; *** "Select Components" wizard page
-WizardSelectComponents=選取元件
+WizardSelectComponents=選擇元件
-SelectComponentsDesc=應安裝哪些元件?
+SelectComponentsDesc=選擇將會被安裝的元件。
-SelectComponentsLabel2=選取您要安裝的元件; 清除您不要安裝的元件。當您準備好要繼續時，請按一下 [下一步]。
+SelectComponentsLabel2=選擇您想要安裝的元件；清除您不想安裝的元件。然後按 [下一步] 繼續安裝。
-FullInstallation=完整安裝
+FullInstallation=完整安裝
 ; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=精簡安裝
+CompactInstallation=最小安裝
-CustomInstallation=自訂安裝
+CustomInstallation=自訂安裝
-NoUninstallWarningTitle=已有此元件
+NoUninstallWarningTitle=元件已存在
-NoUninstallWarning=安裝程式偵測到您的電腦已安裝了下列元件:%n%n%1%n%n將這些元件取消選取並不會使元件解除安裝。%n%n仍要繼續嗎?
+NoUninstallWarning=安裝程式偵測到以下元件已經安裝在您的電腦上:%n%n%1%n%n取消選擇這些元件將不會移除它們。%n%n您仍然要繼續嗎?
 ComponentSize1=%1 KB
 ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=目前的選擇至少需要 [mb] MB 的磁碟空間。
+ComponentsDiskSpaceMBLabel=目前的選擇需要至少 [mb] MB 磁碟空間。
+
 ; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=選取其他工作
+WizardSelectTasks=選擇附加的工作
-SelectTasksDesc=還須執行哪些其他工作?
+SelectTasksDesc=選擇要執行的附加工作。
-SelectTasksLabel2=請選取安裝程式在安裝 [name] 時，須額外執行的其他工作，然後按一下 [下一步]。
+SelectTasksLabel2=選擇安裝程式在安裝 [name] 時要執行的附加工作，然後按 [下一步]。
+
 ; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=選取 [開始] 功能表資料夾
+WizardSelectProgramGroup=選擇「開始」功能表的資料夾
-SelectStartMenuFolderDesc=安裝程式應將程式捷徑置於何處?
+SelectStartMenuFolderDesc=選擇安裝程式建立程式的捷徑的位置。
-SelectStartMenuFolderLabel3=安裝程式將在下列 [開始] 功能表資料夾中建立程式捷徑。
+SelectStartMenuFolderLabel3=安裝程式將會把程式的捷徑建立在下面的「開始」功能表資料夾。
-SelectStartMenuFolderBrowseLabel=若要繼續，請按一下 [下一步]。若您想選取不同的資料夾，請按一下 [瀏覽]。
+SelectStartMenuFolderBrowseLabel=按 [下一步] 繼續，如果您想選擇另一個資料夾，請按 [瀏覽]。
-MustEnterGroupName=必須輸入資料夾名稱。
+MustEnterGroupName=您必須輸入一個資料夾的名稱。
-GroupNameTooLong=資料夾名稱或路徑過長。
+GroupNameTooLong=資料夾名稱或路徑太長。
-InvalidGroupName=此資料夾名稱無效。
+InvalidGroupName=資料夾名稱不正確。
-BadGroupName=資料夾名稱不得包含下列任一字元:%n%n%1
+BadGroupName=資料夾名稱不得包含下列字元:%n%n%1
-NoProgramGroupCheck2=不要建立 [開始] 功能表資料夾(&D)
+NoProgramGroupCheck2=不要在「開始」功能表中建立資料夾(&D)
+
 ; *** "Ready to Install" wizard page
-WizardReady=已可開始安裝
+WizardReady=準備安裝
-ReadyLabel1=安裝程式現在已可開始將 [name] 安裝到您的電腦上。
+ReadyLabel1=安裝程式將開始安裝 [name] 到您的電腦中。
-ReadyLabel2a=若要繼續安裝，請按一下 [安裝]; 若要檢閱或變更任何設定，請按一下 [上一步]。
+ReadyLabel2a=按下 [安裝] 繼續安裝，或按 [上一步] 重新檢視或設定各選項的內容。
-ReadyLabel2b=若要繼續安裝，請按一下 [安裝]。
+ReadyLabel2b=按下 [安裝] 繼續安裝。
-ReadyMemoUserInfo=使用者資訊:
+ReadyMemoUserInfo=使用者資訊
-ReadyMemoDir=目的地位置:
+ReadyMemoDir=目的資料夾:
-ReadyMemoType=安裝類型:
+ReadyMemoType=安裝型態:
-ReadyMemoComponents=選取的元件:
+ReadyMemoComponents=選擇的元件:
-ReadyMemoGroup=[開始] 功能表資料夾:
+ReadyMemoGroup=「開始」功能表資料夾:
-ReadyMemoTasks=其他工作:
+ReadyMemoTasks=附加工作:
+
 ; *** "Preparing to Install" wizard page
-WizardPreparing=正在準備安裝
+WizardPreparing=準備安裝程式
-PreparingDesc=安裝程式正在準備將 [name] 安裝到您的電腦上。
+PreparingDesc=安裝程式準備將 [name] 安裝到您的電腦上。
-PreviousInstallNotCompleted=上一個程式的安裝/移除尚未完成。必須重新啟動電腦，才能完成該安裝。%n%n請在重新啟動電腦之後，重新執行安裝程式，以完成 [name] 的安裝。
+PreviousInstallNotCompleted=先前的安裝/ 解除安裝尚未完成，您必須重新啟動電腦以完成該安裝。%n%n在重新啟動電腦之後，請再執行這個程式來安裝 [name]。
-CannotContinue=安裝程式無法繼續。請按一下 [取消] 以結束。
+CannotContinue=安裝程式無法繼續。請按 [取消] 離開。
-ApplicationsFound=安裝程式必須更新下列應用程式正在使用的一些檔案。建議您允許安裝程式自動關閉這些應用程式。
+ApplicationsFound=下面的應用程式正在使用安裝程式所需要更新的文檔。建議您允許安裝程式自動關閉這些應用程式。
-ApplicationsFound2=安裝程式必須更新下列應用程式正在使用的一些檔案。建議您允許安裝程式自動關閉這些應用程式。當安裝完成之後，安裝程式將會嘗試重新啟動這些應用程式。
+ApplicationsFound2=下面的應用程式正在使用安裝程式所需要更新的文檔。建議您允許安裝程式自動關閉這些應用程式。當安裝過程結束後，本安裝程式將會嘗試重新開啟該應用程式。
-CloseApplications=自動關閉應用程式(&A)
+CloseApplications=關閉應用程式(&A)
-DontCloseApplications=不要關閉應用程式(&D)
+DontCloseApplications=不要關閉應用程式 (&D)
-ErrorCloseApplications=安裝程式無法自動關閉所有應用程式。建議您關閉所有正在使用安裝程式必須更新之檔案的應用程式，然後再繼續。
+ErrorCloseApplications=安裝程式無法自動關閉所有應用程式。建議您在繼續前先關閉所有應用程式使用的檔案。
+
 ; *** "Installing" wizard page
-WizardInstalling=安裝中
+WizardInstalling=正在安裝
-InstallingLabel=請稍候，安裝程式正在將 [name] 安裝到您的電腦上。
+InstallingLabel=請稍候，安裝程式正在將 [name] 安裝到您的電腦上
+
 ; *** "Setup Completed" wizard page
-FinishedHeadingLabel=正在完成 [name] 安裝精靈
+FinishedHeadingLabel=安裝完成
-FinishedLabelNoIcons=安裝程式已完成您電腦上 [name] 的安裝。
+FinishedLabelNoIcons=安裝程式已經將 [name] 安裝在您的電腦上。
-FinishedLabel=安裝程式已完成您電腦上 [name] 的安裝。您可以選取所安裝的捷徑來啟動應用程式。
+FinishedLabel=安裝程式已經將 [name] 安裝在您的電腦中，您可以選擇程式的圖示來執行該應用程式。
-ClickFinish=請按一下 [完成]，以結束安裝。
+ClickFinish=按 [完成] 以結束安裝程式。
-FinishedRestartLabel=安裝程式必須重新啟動您的電腦，才能完成 [name] 的安裝。要立即重新啟動嗎?
+FinishedRestartLabel=要完成 [name] 的安裝，安裝程式必須重新啟動您的電腦。您想要現在重新啟動電腦嗎?
-FinishedRestartMessage=安裝程式必須重新啟動您的電腦，才能完成 [name] 的安裝。%n%n要立即重新啟動嗎?
+FinishedRestartMessage=要完成 [name] 的安裝，安裝程式必須重新啟動您的電腦。%n%n您想要現在重新啟動電腦嗎?
-ShowReadmeCheck=是，我要檢視讀我檔案
+ShowReadmeCheck=是，我要閱讀讀我檔案。
-YesRadio=是，立即重新啟動電腦(&Y)
+YesRadio=是，立即重新啟動電腦(&Y)
-NoRadio=否，稍候再重新啟動電腦(&N)
+NoRadio=否，我稍後重新啟動電腦(&N)
 ; used for example as 'Run MyProg.exe'
-RunEntryExec=執行 %1
+RunEntryExec=執行 %1
 ; used for example as 'View Readme.txt'
-RunEntryShellExec=檢視 %1
+RunEntryShellExec=檢視 %1
-; *** "Setup Needs the Next Disk" stuff
+
-ChangeDiskTitle=安裝程式需要下一張磁片。
+; *** "Setup Needs the Next Disk" 
-SelectDiskLabel2=請插入磁片 %1，然後按一下 [確定]。%n%n若此磁片上的檔案可以在下列顯示之資料夾以外的資料夾中找到，請輸入正確的路徑，或按一下 [瀏覽]。
+ChangeDiskTitle=安裝程式需要下一張磁片
-PathLabel=路徑(&P):
+SelectDiskLabel2=請插入磁片 %1，然後按 [確定]。%n%n如果檔案不在以下所顯示的資料夾之中，請輸入正確的資料夾名稱或按 [瀏覽] 選取。
-FileNotInDir2=在 "%2" 中找不到檔案 "%1"。請插入正確的磁片，或選取其他資料夾。
+PathLabel=路徑(&P):
-SelectDirectoryLabel=請指定下一張磁片的位置。
+FileNotInDir2=檔案“%1”無法在“%2”找到。請插入正確的磁片或選擇其它的資料夾。
+SelectDirectoryLabel=請指定下一張磁片的位置。
+
 ; *** Installation phase messages
-SetupAborted=安裝未安成。%n%n請修正問題，再重新執行安裝程式。
+SetupAborted=安裝沒有完成。%n%n請更正問題後重新安裝一次。
-EntryAbortRetryIgnore=若要再試一次，請按一下 [重試]; 若要繼續，請按一下 [忽略]; 若要取消安裝，請按一下 [中止]。
+AbortRetryIgnoreSelectAction=選取動作
+AbortRetryIgnoreRetry=請再試一次 (&T)
+AbortRetryIgnoreIgnore=略過錯誤並繼續 (&I)
+AbortRetryIgnoreCancel=取消安裝
+
 ; *** Installation status messages
-StatusClosingApplications=正在關閉應用程式...
+StatusClosingApplications=正在關閉應用程式...
-StatusCreateDirs=正在建立目錄...
+StatusCreateDirs=正在建立資料夾...
-StatusExtractFiles=正在解壓縮檔案...
+StatusExtractFiles=正在解壓縮檔案...
-StatusCreateIcons=正在建立捷徑...
+StatusCreateIcons=正在建立程式集圖示...
-StatusCreateIniEntries=正在建立 INI 項目...
+StatusCreateIniEntries=寫入 INI 檔案的項目...
-StatusCreateRegistryEntries=正在建立登錄項目...
+StatusCreateRegistryEntries=正在更新系統登錄...
-StatusRegisterFiles=正在登錄檔案...
+StatusRegisterFiles=正在登錄檔案...
-StatusSavingUninstall=正在儲存解除安裝資訊...
+StatusSavingUninstall=儲存解除安裝資訊...
-StatusRunProgram=正在完成安裝...
+StatusRunProgram=正在完成安裝...
-StatusRestartingApplications=正在重新啟動應用程式...
+StatusRestartingApplications=正在重新開啟應用程式...
-StatusRollback=正在復原變更...
+StatusRollback=正在復原變更...
+
 ; *** Misc. errors
-ErrorInternal2=內部錯誤: %1
+ErrorInternal2=內部錯誤: %1
-ErrorFunctionFailedNoCode=%1 失敗
+ErrorFunctionFailedNoCode=%1 失敗
-ErrorFunctionFailed=%1 失敗; 代碼 %2
+ErrorFunctionFailed=%1 失敗；代碼 %2
-ErrorFunctionFailedWithMessage=%1 失敗; 代碼 %2。%n%3
+ErrorFunctionFailedWithMessage=%1 失敗；代碼 %2.%n%3
-ErrorExecutingProgram=無法執行檔案:%n%1
+ErrorExecutingProgram=無法執行檔案:%n%1
+
 ; *** Registry errors
-ErrorRegOpenKey=開啟登錄機碼時發生錯誤:%n%1\%2
+ErrorRegOpenKey=無法開啟登錄鍵:%n%1\%2
-ErrorRegCreateKey=建立登錄機碼時發生錯誤:%n%1\%2
+ErrorRegCreateKey=無法建立登錄項目:%n%1\%2
-ErrorRegWriteKey=寫入登錄機碼時發生錯誤:%n%1\%2
+ErrorRegWriteKey=無法變更登錄項目:%n%1\%2
+
 ; *** INI errors
-ErrorIniEntry=在檔案 "%1" 中建立 INI 項目時發生錯誤。
+ErrorIniEntry=在檔案“%1”建立 INI 項目錯誤。
+
 ; *** File copying errors
-FileAbortRetryIgnore=若要再試一次，請按一下 [重試]; 若要略過此檔案，請按一下 [忽略] (不建議使用); 若要取消安裝，請按一下 [中止]。
+FileAbortRetryIgnoreSkipNotRecommended=略過這個檔案 (不建議) (&S)
-FileAbortRetryIgnore2=若要再試一次，請按一下 [重試]; 若要繼續，請按一下 [忽略] (不建議使用); 若要取消安裝，請按一下 [中止]。
+FileAbortRetryIgnoreIgnoreNotRecommended=略過錯誤並繼續 (不建議) (&I)
-SourceIsCorrupted=原始程式檔已損毀
+SourceDoesntExist=來源檔案“%1”不存在。
-SourceDoesntExist=原始程式檔 "%1" 不存在
+SourceIsCorrupted=來源檔案已經損毀。
-ExistingFileReadOnly=現有檔案已標記為唯讀。%n%n若要移除唯讀屬性，然後再試一次，請按一下 [重試]; 若要略過此檔案，請按一下 [忽略]; 若要取消安裝，請按一下 [中止]。
+ExistingFileReadOnly2=無法取代現有檔案，因為檔案已標示為唯讀。
-ErrorReadingExistingDest=嘗試讀取現有檔案時發生錯誤:
+ExistingFileReadOnlyRetry=移除唯讀屬性並重試 (&R)
-FileExists=已有此檔案。%n%n要由安裝程式加以覆寫嗎?
+ExistingFileReadOnlyKeepExisting=保留現有檔案 (&K)
-ExistingFileNewer=現有檔案較安裝程式嘗試安裝的檔案新。建議您保留現有檔案。%n%n要保留現有的檔案嗎?
+ErrorReadingExistingDest=讀取一個已存在的檔案時發生錯誤:
-ErrorChangingAttr=嘗試變更現有檔案的屬性時發生錯誤:
+FileExists=檔案已經存在。%n%n 要讓安裝程式加以覆寫嗎?
-ErrorCreatingTemp=嘗試在目的地目錄中建立檔案時發生錯誤:
+ExistingFileNewer=存在的檔案版本比較新，建議您保留目前已存在的檔案。%n%n您要保留目前已存在的檔案嗎?
-ErrorReadingSource=嘗試讀取原始程式檔時發生錯誤:
+ErrorChangingAttr=在變更檔案屬性時發生錯誤:
-ErrorCopying=嘗試複製檔案時發生錯誤:
+ErrorCreatingTemp=在目的資料夾中建立檔案時發生錯誤:
-ErrorReplacingExistingFile=嘗試取代現有檔案時發生錯誤:
+ErrorReadingSource=讀取原始檔案時發生錯誤:
-ErrorRestartReplace=RestartReplace 失敗:
+ErrorCopying=復制檔案時發生錯誤:
-ErrorRenamingTemp=嘗試重新命名目的地目錄中的檔案時發生錯誤:
+ErrorReplacingExistingFile=取代檔案時發生錯誤:
-ErrorRegisterServer=無法登錄 DLL/OCX: %1
+ErrorRestartReplace=重新啟動電腦後取代檔案失敗:
-ErrorRegSvr32Failed=RegSvr32 失敗，結束代碼為 %1
+ErrorRenamingTemp=在目的資料夾變更檔案名稱時發生錯誤:
-ErrorRegisterTypeLib=無法登錄類型程式庫: %1
+ErrorRegisterServer=無法注冊 DLL/OCX 檔案: %1。
+ErrorRegSvr32Failed=RegSvr32 失敗；退出代碼 %1
+ErrorRegisterTypeLib=無法注冊類型庫: %1。
+
+; *** Uninstall display name markings
+; used for example as 'My Program (32-bit)'
+UninstallDisplayNameMark=%1 (%2)
+; used for example as 'My Program (32-bit, All users)'
+UninstallDisplayNameMarks=%1 (%2, %3)
+UninstallDisplayNameMark32Bit=32-bit
+UninstallDisplayNameMark64Bit=64-bit
+UninstallDisplayNameMarkAllUsers=所有使用者
+UninstallDisplayNameMarkCurrentUser=目前使用者
+
 ; *** Post-installation errors
-ErrorOpeningReadme=嘗試開啟讀我檔案時發生錯誤。
+ErrorOpeningReadme=開啟讀我檔案時發生錯誤。
-ErrorRestartingComputer=安裝程式無法重新啟動電腦。請手動執行此作業。
+ErrorRestartingComputer=安裝程式無法重新啟動電腦，請以手動方式自行重新啟動電腦。
+
 ; *** Uninstaller messages
-UninstallNotFound=沒有檔案 "%1"。無法解除安裝。
+UninstallNotFound=檔案“%1”不存在，無法移除程式。
-UninstallOpenError=無法開啟檔案 "%1"。無法解除安裝
+UninstallOpenError=無法開啟檔案“%1”，無法移除程式。
-UninstallUnsupportedVer=此版解除安裝程式無法辨識解除安裝記錄檔 "%1" 的格式。無法解除安裝
+UninstallUnsupportedVer=這個版本的解除安裝程式無法辨識記錄檔 “%1” 之格式，無法解除安裝。
-UninstallUnknownEntry=在解除安裝記錄中找到不明的項目 (%1)
+UninstallUnknownEntry=解除安裝記錄檔中發現未知的記錄 (%1)。
-ConfirmUninstall=確定要完全移除 %1 及其所有元件嗎?
+ConfirmUninstall=您確定要完全移除 %1 及其相關的檔案嗎?
-UninstallOnlyOnWin64=只可在 64 位元 Windows 上解除安裝此安裝。
+UninstallOnlyOnWin64=這個程式只能在 64 位元的 Windows 上解除安裝。
-OnlyAdminCanUninstall=只有具備系統管理權限的使用者，才能解除安裝此安裝。
+OnlyAdminCanUninstall=這個程式要具備系統管理員權限的使用者方可解除安裝。
-UninstallStatusLabel=正在從您的電腦移除 %1，請稍候。
+UninstallStatusLabel=正在從您的電腦移除 %1 中，請稍候...
-UninstalledAll=已成功從您的電腦移除 %1。
+UninstalledAll=%1 已經成功從您的電腦中移除。
-UninstalledMost=解除安裝 %1 已完成。%n%n有部分項目無法移除。您可以手動加以移除。
+UninstalledMost=%1 解除安裝完成。%n%n某些檔案及元件無法移除，您可以自行刪除這些檔案。
-UninstalledAndNeedsRestart=若要完成 %1 的解除安裝，必須重新啟動您的電腦。%n%n要立即重新啟動嗎?
+UninstalledAndNeedsRestart=要完成 %1 的解除安裝程序，您必須重新啟動電腦。%n%n您想要現在重新啟動電腦嗎?
-UninstallDataCorrupted="%1" 檔案已損毀。無法解除安裝
+UninstallDataCorrupted=檔案“%1”已經損毀，無法解除安裝。
+
 ; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=要移除共用檔案嗎?
+ConfirmDeleteSharedFileTitle=移除共用檔案
-ConfirmDeleteSharedFile2=系統指出已無任何程式在使用下列共用檔案。您要解除安裝，以移除此共用檔案嗎?%n%n如有任何程式仍在使用此檔案而將該檔案移除，這些程式可能無法正常運作。若不確定，請選擇 [否]。將檔案保留在系統上並不會造成任何不良影響。
+ConfirmDeleteSharedFile2=系統顯示下列共用檔案已不再被任何程式所使用，您要移除這些檔案嗎?%n%n%1%n%n倘若您移除了以上檔案但仍有程式需要使用它們，將造成這些程式無法正常執行，因此您若無法確定請選擇 [否]。保留這些檔案在您的系統中不會造成任何損害。
-SharedFileNameLabel=檔案名稱:
+SharedFileNameLabel=檔案名稱:
-SharedFileLocationLabel=位置:
+SharedFileLocationLabel=位置:
-WizardUninstalling=解除安裝狀態
+WizardUninstalling=解除安裝狀態
-StatusUninstalling=正在解除安裝 %1...
+StatusUninstalling=正在解除安裝 %1...
+
 ; *** Shutdown block reasons
-ShutdownBlockReasonInstallingApp=正在安裝 %1。
+ShutdownBlockReasonInstallingApp=正在安裝 %1.
-ShutdownBlockReasonUninstallingApp=正在解除安裝 %1。
+ShutdownBlockReasonUninstallingApp=正在解除安裝 %1.
+
 ; The custom messages below aren't used by Setup itself, but if you make
 ; use of them in your scripts, you'll want to translate them.
+
 [CustomMessages]
-NameAndVersion=%1 版 %2
+
-AdditionalIcons=其他捷徑:
+NameAndVersion=%1 版本 %2
-CreateDesktopIcon=建立桌面捷徑(&D)
+AdditionalIcons=附加圖示:
-CreateQuickLaunchIcon=建立快速啟動捷徑(&Q)
+CreateDesktopIcon=建立桌面圖示(&D)
-ProgramOnTheWeb=Web 上的 %1
+CreateQuickLaunchIcon=建立快速啟動圖示(&Q)
-UninstallProgram=解除安裝 %1
+ProgramOnTheWeb=%1 的網站
-LaunchProgram=啟動 %1
+UninstallProgram=解除安裝 %1
-AssocFileExtension=關聯 %1 與 %2 副檔名(&A)
+LaunchProgram=啟動 %1
-AssocingFileExtension=正在建立 %1 與 %2 副檔名的關聯…
+AssocFileExtension=將 %1 與檔案副檔名 %2 產生關聯(&A)
-AutoStartProgramGroupDescription=啟動:
+AssocingFileExtension=正在將 %1 與檔案副檔名 %2 產生關聯...
-AutoStartProgram=自動啟動 %1
+AutoStartProgramGroupDescription=開啟:
-AddonHostProgramNotFound=在選取的資料夾中找不到 %1。%n%n仍要繼續嗎?
+AutoStartProgram=自動開啟 %1
+AddonHostProgramNotFound=%1 無法在您所選的資料夾中找到。%n%n您是否還要繼續？

build/win32/i18n/messages.en.isl

@@ -1,4 +1,11 @@
+[Messages]
+FinishedLabel=Setup has finished installing [name] on your computer. The application may be launched by selecting the installed shortcuts.
+ConfirmUninstall=Are you sure you want to completely remove %1 and all of its components?
+
 [CustomMessages]
+AdditionalIcons=Additional icons:
+CreateDesktopIcon=Create a &desktop icon
+CreateQuickLaunchIcon=Create a &Quick Launch icon
 AddContextMenuFiles=Add "Open with %1" action to Windows Explorer file context menu
 AddContextMenuFolders=Add "Open with %1" action to Windows Explorer directory context menu
 AssociateWithFiles=Register %1 as an editor for supported file types

build/yarn.lock

@@ -1817,10 +1817,10 @@ https-proxy-agent@^4.0.0:
     agent-base "5"
     debug "4"
 
-iconv-lite-umd@0.6.5:
+iconv-lite-umd@0.6.8:
-  version "0.6.5"
+  version "0.6.8"
-  resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.5.tgz#6a1f621a3b4d125f72feff813a9839e1ebd6c722"
+  resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.8.tgz#5ad310ec126b260621471a2d586f7f37b9958ec0"
-  integrity sha512-WDegH4al+e3n3jTOStRvm+jzDA3JMUQGgzdAsMxAgcgB0Oi72HjfdsoX08ieKsy3rKexXVjWZr41aOIUaCZnMg==
+  integrity sha512-zvXJ5gSwMC9JD3wDzH8CoZGc1pbiJn12Tqjk8BXYCnYz3hYL5GRjHW8LEykjXhV9WgNGI4rgpgHcbIiBfrRq6A==
 
 iconv-lite@^0.4.4:
   version "0.4.24"
@@ -3539,10 +3539,10 @@ typescript@^3.0.1:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
   integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
 
-typescript@^4.0.0-dev.20200629:
+typescript@^4.0.0-dev.20200708:
-  version "4.0.0-dev.20200629"
+  version "4.0.0-dev.20200708"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200629.tgz#4631667ebffe3a340beee885a4bebe3a73b6f18e"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200708.tgz#9cf526945590456f34b158b180a6f8a2e0b57306"
-  integrity sha512-c4DUu7KvTcx4x7V8sBWexYNkCfioiH1huOJL6WFAA8Oot0Gr/+PlKKDBS9fYjsadEv1JI1qboJKobwLQn0kQXw==
+  integrity sha512-A1brZPJRwkm2pxOSTIOVqLvrhF1swfLvDAgN+jRP/yUWNn+0OqbfunuY/jvRbtkEP4/AWZ+M2P625Y+JDN/j2A==
 
 typical@^4.0.0:
   version "4.0.0"

cgmanifest.json

@@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "e4745133a1d3745f066e068b8033c6a269b59caf"
+					"commitHash": "052d3b44972e6d94ef40054d46c150b7cdd7a5d8"
 				}
 			},
 			"licenseDetail": [
@@ -40,7 +40,7 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "78.0.3904.130"
+			"version": "80.0.3987.165"
 		},
 		{
 			"component": {
@@ -48,11 +48,11 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "787378879acfb212ed4ff824bf9f767a24a5cb43a"
+					"commitHash": "42cce5a9d0fd905bf4ad7a2528c36572dfb8b5ad"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "12.8.1"
+			"version": "12.13.0"
 		},
 		{
 			"component": {
@@ -60,12 +60,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "5f93e889020d279d5a9cd1ecab080ab467312447"
+					"commitHash": "87fd06bc96bce8f46ca05b8315657fd230bcac85"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "7.3.2"
+			"version": "8.3.3"
 		},
 		{
 			"component": {
@@ -533,7 +533,7 @@
 				"git": {
 					"name": "ripgrep",
 					"repositoryUrl": "https://github.com/BurntSushi/ripgrep",
-					"commitHash": "8a7db1a918e969b85cd933d8ed9fa5285b281ba4"
+					"commitHash": "973de50c9ef451da2cfcdfa86f2b2711d8d6ff48"
 				}
 			},
 			"isOnlyProductionDependency": true,

extensions/extension-editing/extension-browser.webpack.config.js

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withBrowserDefaults = require('../shared.webpack.config').browser;
+
+module.exports = withBrowserDefaults({
+	context: __dirname,
+	entry: {
+		extension: './src/extensionEditingBrowserMain.ts'
+	},
+	output: {
+		filename: 'extensionEditingBrowserMain.js'
+	}
+});
+

extensions/extension-editing/extension.webpack.config.js

@@ -12,7 +12,7 @@ const withDefaults = require('../shared.webpack.config');
 module.exports = withDefaults({
 	context: __dirname,
 	entry: {
-		extension: './src/extension.ts',
+		extension: './src/extensionEditingMain.ts',
 	},
 	externals: {
 		'../../../product.json': 'commonjs ../../../product.json',

extensions/extension-editing/package.json

@@ -13,7 +13,8 @@
 		"onLanguage:markdown",
 		"onLanguage:typescript"
 	],
-	"main": "./out/extension",
+	"main": "./out/extensionEditingMain",
+	"browser": "./dist/browser/extensionEditingBrowserMain",
 	"scripts": {
 		"compile": "gulp compile-extension:extension-editing",
 		"watch": "gulp watch-extension:extension-editing"

extensions/extension-editing/src/extensionEditingBrowserMain.ts

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { PackageDocument } from './packageDocumentHelper';
+
+export function activate(context: vscode.ExtensionContext) {
+	//package.json suggestions
+	context.subscriptions.push(registerPackageDocumentCompletions());
+
+}
+
+function registerPackageDocumentCompletions(): vscode.Disposable {
+	return vscode.languages.registerCompletionItemProvider({ language: 'json', pattern: '**/package.json' }, {
+		provideCompletionItems(document, position, token) {
+			return new PackageDocument(document).provideCompletionItems(position, token);
+		}
+	});
+}

extensions/git/package.json

@@ -1789,8 +1789,8 @@
           "diff"
         ],
         "extensions": [
-          ".patch",
           ".diff",
+          ".patch",
           ".rej"
         ],
         "configuration": "./languages/diff.language-configuration.json"
@@ -1878,8 +1878,8 @@
   "dependencies": {
     "byline": "^5.0.0",
     "file-type": "^7.2.0",
-    "iconv-lite-umd": "0.6.5",
+    "iconv-lite-umd": "0.6.8",
-    "jschardet": "2.1.1",
+    "jschardet": "2.2.1",
     "vscode-extension-telemetry": "0.1.1",
     "vscode-nls": "^4.0.0",
     "vscode-uri": "^2.0.0",

extensions/git/src/api/api1.ts

@@ -5,10 +5,12 @@
 
 import { Model } from '../model';
 import { Repository as BaseRepository, Resource } from '../repository';
-import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, GitExtension, RefType, RemoteSourceProvider, CredentialsProvider, BranchQuery } from './git';
+import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, RemoteSourceProvider, CredentialsProvider, BranchQuery, PushErrorHandler } from './git';
 import { Event, SourceControlInputBox, Uri, SourceControl, Disposable, commands } from 'vscode';
 import { mapEvent } from '../util';
 import { toGitUri } from '../uri';
+import { pickRemoteSource, PickRemoteSourceOptions } from '../remoteSource';
+import { GitExtensionImpl } from './extension';
 
 class ApiInputBox implements InputBox {
 	set value(value: string) { this._inputBox.value = value; }
@@ -271,6 +273,10 @@ export class ApiImpl implements API {
 		return this._model.registerCredentialsProvider(provider);
 	}
 
+	registerPushErrorHandler(handler: PushErrorHandler): Disposable {
+		return this._model.registerPushErrorHandler(handler);
+	}
+
 	constructor(private _model: Model) { }
 }
 
@@ -308,41 +314,51 @@ function getStatus(status: Status): string {
 	return 'UNKNOWN';
 }
 
-export function registerAPICommands(extension: GitExtension): Disposable {
+export function registerAPICommands(extension: GitExtensionImpl): Disposable {
-	return Disposable.from(
+	const disposables: Disposable[] = [];
-		commands.registerCommand('git.api.getRepositories', () => {
-			const api = extension.getAPI(1);
-			return api.repositories.map(r => r.rootUri.toString());
-		}),
 
-		commands.registerCommand('git.api.getRepositoryState', (uri: string) => {
+	disposables.push(commands.registerCommand('git.api.getRepositories', () => {
-			const api = extension.getAPI(1);
+		const api = extension.getAPI(1);
-			const repository = api.getRepository(Uri.parse(uri));
+		return api.repositories.map(r => r.rootUri.toString());
+	}));
 
-			if (!repository) {
+	disposables.push(commands.registerCommand('git.api.getRepositoryState', (uri: string) => {
-				return null;
+		const api = extension.getAPI(1);
-			}
+		const repository = api.getRepository(Uri.parse(uri));
 
-			const state = repository.state;
+		if (!repository) {
+			return null;
+		}
 
-			const ref = (ref: Ref | undefined) => (ref && { ...ref, type: getRefType(ref.type) });
+		const state = repository.state;
-			const change = (change: Change) => ({
-				uri: change.uri.toString(),
-				originalUri: change.originalUri.toString(),
-				renameUri: change.renameUri?.toString(),
-				status: getStatus(change.status)
-			});
 
-			return {
+		const ref = (ref: Ref | undefined) => (ref && { ...ref, type: getRefType(ref.type) });
-				HEAD: ref(state.HEAD),
+		const change = (change: Change) => ({
-				refs: state.refs.map(ref),
+			uri: change.uri.toString(),
-				remotes: state.remotes,
+			originalUri: change.originalUri.toString(),
-				submodules: state.submodules,
+			renameUri: change.renameUri?.toString(),
-				rebaseCommit: state.rebaseCommit,
+			status: getStatus(change.status)
-				mergeChanges: state.mergeChanges.map(change),
+		});
-				indexChanges: state.indexChanges.map(change),
+
-				workingTreeChanges: state.workingTreeChanges.map(change)
+		return {
-			};
+			HEAD: ref(state.HEAD),
-		})
+			refs: state.refs.map(ref),
-	);
+			remotes: state.remotes,
+			submodules: state.submodules,
+			rebaseCommit: state.rebaseCommit,
+			mergeChanges: state.mergeChanges.map(change),
+			indexChanges: state.indexChanges.map(change),
+			workingTreeChanges: state.workingTreeChanges.map(change)
+		};
+	}));
+
+	disposables.push(commands.registerCommand('git.api.getRemoteSources', (opts?: PickRemoteSourceOptions) => {
+		if (!extension.model) {
+			return;
+		}
+
+		return pickRemoteSource(extension.model, opts);
+	}));
+
+	return Disposable.from(...disposables);
 }

extensions/git/src/api/extension.ts

@@ -7,7 +7,6 @@ import { Model } from '../model';
 import { GitExtension, Repository, API } from './git';
 import { ApiRepository, ApiImpl } from './api1';
 import { Event, EventEmitter } from 'vscode';
-import { latchEvent } from '../util';
 
 export function deprecated(_target: any, key: string, descriptor: any): void {
 	if (typeof descriptor.value !== 'function') {
@@ -26,17 +25,27 @@ export class GitExtensionImpl implements GitExtension {
 	enabled: boolean = false;
 
 	private _onDidChangeEnablement = new EventEmitter<boolean>();
-	readonly onDidChangeEnablement: Event<boolean> = latchEvent(this._onDidChangeEnablement.event);
+	readonly onDidChangeEnablement: Event<boolean> = this._onDidChangeEnablement.event;
 
 	private _model: Model | undefined = undefined;
 
 	set model(model: Model | undefined) {
 		this._model = model;
 
-		this.enabled = !!model;
+		const enabled = !!model;
+
+		if (this.enabled === enabled) {
+			return;
+		}
+
+		this.enabled = enabled;
 		this._onDidChangeEnablement.fire(this.enabled);
 	}
 
+	get model(): Model | undefined {
+		return this._model;
+	}
+
 	constructor(model?: Model) {
 		if (model) {
 			this.enabled = true;
@@ -73,4 +82,4 @@ export class GitExtensionImpl implements GitExtension {
 
 		return new ApiImpl(this._model);
 	}
-}
+}

extensions/git/src/api/git.d.ts

@@ -223,6 +223,10 @@ export interface CredentialsProvider {
 	getCredentials(host: Uri): ProviderResult<Credentials>;
 }
 
+export interface PushErrorHandler {
+	handlePushError(repository: Repository, remote: Remote, refspec: string, error: Error & { gitErrorCode: GitErrorCodes }): Promise<boolean>;
+}
+
 export type APIState = 'uninitialized' | 'initialized';
 
 export interface API {
@@ -239,6 +243,7 @@ export interface API {
 
 	registerRemoteSourceProvider(provider: RemoteSourceProvider): Disposable;
 	registerCredentialsProvider(provider: CredentialsProvider): Disposable;
+	registerPushErrorHandler(handler: PushErrorHandler): Disposable;
 }
 
 export interface GitExtension {
@@ -276,6 +281,7 @@ export const enum GitErrorCodes {
 	CantOpenResource = 'CantOpenResource',
 	GitNotFound = 'GitNotFound',
 	CantCreatePipe = 'CantCreatePipe',
+	PermissionDenied = 'PermissionDenied',
 	CantAccessRemote = 'CantAccessRemote',
 	RepositoryNotFound = 'RepositoryNotFound',
 	RepositoryIsLocked = 'RepositoryIsLocked',

extensions/git/src/commands.ts

@@ -6,10 +6,10 @@
 import { lstat, Stats } from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-import { commands, Disposable, LineChange, MessageOptions, OutputChannel, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, QuickPick } from 'vscode';
+import { commands, Disposable, LineChange, MessageOptions, OutputChannel, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env } from 'vscode';
 import TelemetryReporter from 'vscode-extension-telemetry';
 import * as nls from 'vscode-nls';
-import { Branch, GitErrorCodes, Ref, RefType, Status, CommitOptions, RemoteSourceProvider, RemoteSource } from './api/git';
+import { Branch, GitErrorCodes, Ref, RefType, Status, CommitOptions, RemoteSourceProvider } from './api/git';
 import { ForcePushMode, Git, Stash } from './git';
 import { Model } from './model';
 import { Repository, Resource, ResourceGroupType } from './repository';
@@ -18,8 +18,8 @@ import { fromGitUri, toGitUri, isGitUri } from './uri';
 import { grep, isDescendant, pathEquals } from './util';
 import { Log, LogLevel } from './log';
 import { GitTimelineItem } from './timelineProvider';
-import { throttle, debounce } from './decorators';
 import { ApiRepository } from './api/api1';
+import { pickRemoteSource } from './remoteSource';
 
 const localize = nls.loadMessageBundle();
 
@@ -240,72 +240,6 @@ interface PushOptions {
 	silent?: boolean;
 }
 
-async function getQuickPickResult<T extends QuickPickItem>(quickpick: QuickPick<T>): Promise<T | undefined> {
-	const result = await new Promise<T | undefined>(c => {
-		quickpick.onDidAccept(() => c(quickpick.selectedItems[0]));
-		quickpick.onDidHide(() => c(undefined));
-		quickpick.show();
-	});
-
-	quickpick.hide();
-	return result;
-}
-
-class RemoteSourceProviderQuickPick {
-
-	private quickpick: QuickPick<QuickPickItem & { remoteSource?: RemoteSource }>;
-
-	constructor(private provider: RemoteSourceProvider) {
-		this.quickpick = window.createQuickPick();
-		this.quickpick.ignoreFocusOut = true;
-
-		if (provider.supportsQuery) {
-			this.quickpick.placeholder = localize('type to search', "Repository name (type to search)");
-			this.quickpick.onDidChangeValue(this.onDidChangeValue, this);
-		} else {
-			this.quickpick.placeholder = localize('type to filter', "Repository name");
-		}
-	}
-
-	@debounce(300)
-	onDidChangeValue(): void {
-		this.query();
-	}
-
-	@throttle
-	async query(): Promise<void> {
-		this.quickpick.busy = true;
-
-		try {
-			const remoteSources = await this.provider.getRemoteSources(this.quickpick.value) || [];
-
-			if (remoteSources.length === 0) {
-				this.quickpick.items = [{
-					label: localize('none found', "No remote repositories found."),
-					alwaysShow: true
-				}];
-			} else {
-				this.quickpick.items = remoteSources.map(remoteSource => ({
-					label: remoteSource.name,
-					description: remoteSource.description || (typeof remoteSource.url === 'string' ? remoteSource.url : remoteSource.url[0]),
-					remoteSource
-				}));
-			}
-		} catch (err) {
-			this.quickpick.items = [{ label: localize('error', "$(error) Error: {0}", err.message), alwaysShow: true }];
-			console.error(err);
-		} finally {
-			this.quickpick.busy = false;
-		}
-	}
-
-	async pick(): Promise<RemoteSource | undefined> {
-		this.query();
-		const result = await getQuickPickResult(this.quickpick);
-		return result?.remoteSource;
-	}
-}
-
 export class CommandCenter {
 
 	private disposables: Disposable[];
@@ -527,51 +461,10 @@ export class CommandCenter {
 	@command('git.clone')
 	async clone(url?: string, parentPath?: string): Promise<void> {
 		if (!url) {
-			const quickpick = window.createQuickPick<(QuickPickItem & { provider?: RemoteSourceProvider, url?: string })>();
+			url = await pickRemoteSource(this.model, {
-			quickpick.ignoreFocusOut = true;
+				providerLabel: provider => localize('clonefrom', "Clone from {0}", provider.name),
-
+				urlLabel: localize('repourl', "Clone from URL")
-			const providers = this.model.getRemoteProviders()
+			});
-				.map(provider => ({ label: (provider.icon ? `$(${provider.icon}) ` : '') + localize('clonefrom', "Clone from {0}", provider.name), alwaysShow: true, provider }));
-
-			quickpick.placeholder = providers.length === 0
-				? localize('provide url', "Provide repository URL")
-				: localize('provide url or pick', "Provide repository URL or pick a repository source.");
-
-			const updatePicks = (value?: string) => {
-				if (value) {
-					quickpick.items = [{
-						label: localize('repourl', "Clone from URL"),
-						description: value,
-						alwaysShow: true,
-						url: value
-					},
-					...providers];
-				} else {
-					quickpick.items = providers;
-				}
-			};
-
-			quickpick.onDidChangeValue(updatePicks);
-			updatePicks();
-
-			const result = await getQuickPickResult(quickpick);
-
-			if (result) {
-				if (result.url) {
-					url = result.url;
-				} else if (result.provider) {
-					const quickpick = new RemoteSourceProviderQuickPick(result.provider);
-					const remote = await quickpick.pick();
-
-					if (remote) {
-						if (typeof remote.url === 'string') {
-							url = remote.url;
-						} else if (remote.url.length > 0) {
-							url = await window.showQuickPick(remote.url, { ignoreFocusOut: true, placeHolder: localize('pick url', "Choose a URL to clone from.") });
-						}
-					}
-				}
-			}
 		}
 
 		if (!url) {
@@ -845,7 +738,7 @@ export class CommandCenter {
 			try {
 				document = await workspace.openTextDocument(uri);
 			} catch (error) {
-				await commands.executeCommand<void>('vscode.open', uri, opts);
+				await commands.executeCommand('vscode.open', uri, opts);
 				continue;
 			}
 
@@ -858,7 +751,7 @@ export class CommandCenter {
 				const editor = await window.showTextDocument(document, opts);
 				editor.revealRange(previousVisibleRanges[0]);
 			} else {
-				await window.showTextDocument(document, opts);
+				await commands.executeCommand('vscode.open', uri, opts);
 			}
 		}
 	}
@@ -2146,52 +2039,10 @@ export class CommandCenter {
 
 	@command('git.addRemote', { repository: true })
 	async addRemote(repository: Repository): Promise<string | undefined> {
-		const quickpick = window.createQuickPick<(QuickPickItem & { provider?: RemoteSourceProvider, url?: string })>();
+		const url = await pickRemoteSource(this.model, {
-		quickpick.ignoreFocusOut = true;
+			providerLabel: provider => localize('addfrom', "Add remote from {0}", provider.name),
-
+			urlLabel: localize('addFrom', "Add remote from URL")
-		const providers = this.model.getRemoteProviders()
+		});
-			.map(provider => ({ label: (provider.icon ? `$(${provider.icon}) ` : '') + localize('addfrom', "Add remote from {0}", provider.name), alwaysShow: true, provider }));
-
-		quickpick.placeholder = providers.length === 0
-			? localize('provide url', "Provide repository URL")
-			: localize('provide url or pick', "Provide repository URL or pick a repository source.");
-
-		const updatePicks = (value?: string) => {
-			if (value) {
-				quickpick.items = [{
-					label: localize('addFrom', "Add remote from URL"),
-					description: value,
-					alwaysShow: true,
-					url: value
-				},
-				...providers];
-			} else {
-				quickpick.items = providers;
-			}
-		};
-
-		quickpick.onDidChangeValue(updatePicks);
-		updatePicks();
-
-		const result = await getQuickPickResult(quickpick);
-		let url: string | undefined;
-
-		if (result) {
-			if (result.url) {
-				url = result.url;
-			} else if (result.provider) {
-				const quickpick = new RemoteSourceProviderQuickPick(result.provider);
-				const remote = await quickpick.pick();
-
-				if (remote) {
-					if (typeof remote.url === 'string') {
-						url = remote.url;
-					} else if (remote.url.length > 0) {
-						url = await window.showQuickPick(remote.url, { ignoreFocusOut: true, placeHolder: localize('pick url', "Choose a URL to clone from.") });
-					}
-				}
-			}
-		}
 
 		if (!url) {
 			return;
@@ -2533,8 +2384,7 @@ export class CommandCenter {
 
 	@command('git.timeline.openDiff', { repository: false })
 	async timelineOpenDiff(item: TimelineItem, uri: Uri | undefined, _source: string) {
-		// eslint-disable-next-line eqeqeq
+		if (uri === undefined || uri === null || !GitTimelineItem.is(item)) {
-		if (uri == null || !GitTimelineItem.is(item)) {
 			return undefined;
 		}
 

extensions/git/src/git.ts

@@ -419,7 +419,7 @@ export class Git {
 	}
 
 	async getRepositoryRoot(repositoryPath: string): Promise<string> {
-		const result = await this.exec(repositoryPath, ['rev-parse', '--show-toplevel']);
+		const result = await this.exec(repositoryPath, ['rev-parse', '--show-toplevel'], { log: false });
 
 		// Keep trailing spaces which are part of the directory name
 		const repoPath = path.normalize(result.stdout.trimLeft().replace(/[\r\n]+$/, ''));
@@ -437,8 +437,7 @@ export class Git {
 					try {
 						const networkPath = await new Promise<string>(resolve =>
 							realpath.native(`${letter}:`, { encoding: 'utf8' }, (err, resolvedPath) =>
-								// eslint-disable-next-line eqeqeq
+								resolve(err !== null ? undefined : resolvedPath),
-								resolve(err != null ? undefined : resolvedPath),
 							),
 						);
 						if (networkPath !== undefined) {
@@ -1628,6 +1627,8 @@ export class Repository {
 				err.gitErrorCode = GitErrorCodes.RemoteConnectionError;
 			} else if (/^fatal: The current branch .* has no upstream branch/.test(err.stderr || '')) {
 				err.gitErrorCode = GitErrorCodes.NoUpstreamBranch;
+			} else if (/Permission.*denied/.test(err.stderr || '')) {
+				err.gitErrorCode = GitErrorCodes.PermissionDenied;
 			}
 
 			throw err;

extensions/git/src/main.ts

@@ -128,7 +128,7 @@ async function warnAboutMissingGit(): Promise<void> {
 	}
 }*/
 
-export async function _activate(context: ExtensionContext): Promise<GitExtension> {
+export async function _activate(context: ExtensionContext): Promise<GitExtensionImpl> {
 	const disposables: Disposable[] = [];
 	context.subscriptions.push(new Disposable(() => Disposable.from(...disposables).dispose()));
 
@@ -176,8 +176,7 @@ export async function activate(context: ExtensionContext): Promise<GitExtension>
 	return result;
 }
 
-// @ts-expect-error
+async function checkGitv1(info: IGit): Promise<void> {
-async function checkGitVersion(info: IGit): Promise<void> {
 	const config = workspace.getConfiguration('git');
 	const shouldIgnore = config.get<boolean>('ignoreLegacyWarning') === true;
 
@@ -204,3 +203,28 @@ async function checkGitVersion(info: IGit): Promise<void> {
 		await config.update('ignoreLegacyWarning', true, true);
 	}
 }
+
+async function checkGitWindows(info: IGit): Promise<void> {
+	if (!/^2\.(25|26)\./.test(info.version)) {
+		return;
+	}
+
+	const update = localize('updateGit', "Update Git");
+	const choice = await window.showWarningMessage(
+		localize('git2526', "There are known issues with the installed Git {0}. Please update to Git >= 2.27 for the git features to work correctly.", info.version),
+		update
+	);
+
+	if (choice === update) {
+		commands.executeCommand('vscode.open', Uri.parse('https://git-scm.com/'));
+	}
+}
+
+// @ts-expect-error
+async function checkGitVersion(info: IGit): Promise<void> {
+	await checkGitv1(info);
+
+	if (process.platform === 'win32') {
+		await checkGitWindows(info);
+	}
+}

extensions/git/src/model.ts

@@ -12,9 +12,10 @@ import * as path from 'path';
 import * as fs from 'fs';
 import * as nls from 'vscode-nls';
 import { fromGitUri } from './uri';
-import { APIState as State, RemoteSourceProvider, CredentialsProvider } from './api/git';
+import { APIState as State, RemoteSourceProvider, CredentialsProvider, PushErrorHandler } from './api/git';
 import { Askpass } from './askpass';
 import { IRemoteSourceProviderRegistry } from './remoteProvider';
+import { IPushErrorHandlerRegistry } from './pushError';
 
 const localize = nls.loadMessageBundle();
 
@@ -46,7 +47,7 @@ interface OpenRepository extends Disposable {
 	repository: Repository;
 }
 
-export class Model implements IRemoteSourceProviderRegistry {
+export class Model implements IRemoteSourceProviderRegistry, IPushErrorHandlerRegistry {
 
 	private _onDidOpenRepository = new EventEmitter<Repository>();
 	readonly onDidOpenRepository: Event<Repository> = this._onDidOpenRepository.event;
@@ -94,6 +95,8 @@ export class Model implements IRemoteSourceProviderRegistry {
 	private _onDidRemoveRemoteSourceProvider = new EventEmitter<RemoteSourceProvider>();
 	readonly onDidRemoveRemoteSourceProvider = this._onDidRemoveRemoteSourceProvider.event;
 
+	private pushErrorHandlers = new Set<PushErrorHandler>();
+
 	private disposables: Disposable[] = [];
 
 	constructor(readonly git: Git, private readonly askpass: Askpass, private globalState: Memento, private outputChannel: OutputChannel) {
@@ -269,7 +272,7 @@ export class Model implements IRemoteSourceProviderRegistry {
 			}
 
 			const dotGit = await this.git.getRepositoryDotGit(repositoryRoot);
-			const repository = new Repository(this.git.open(repositoryRoot, dotGit), this, this.globalState, this.outputChannel);
+			const repository = new Repository(this.git.open(repositoryRoot, dotGit), this, this, this.globalState, this.outputChannel);
 
 			this.open(repository);
 			await repository.status();
@@ -485,6 +488,15 @@ export class Model implements IRemoteSourceProviderRegistry {
 		return [...this.remoteSourceProviders.values()];
 	}
 
+	registerPushErrorHandler(handler: PushErrorHandler): Disposable {
+		this.pushErrorHandlers.add(handler);
+		return toDisposable(() => this.pushErrorHandlers.delete(handler));
+	}
+
+	getPushErrorHandlers(): PushErrorHandler[] {
+		return [...this.pushErrorHandlers];
+	}
+
 	dispose(): void {
 		const openRepositories = [...this.openRepositories];
 		openRepositories.forEach(r => r.dispose());

extensions/git/src/pushError.ts

@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from 'vscode';
+import { PushErrorHandler } from './api/git';
+
+export interface IPushErrorHandlerRegistry {
+	registerPushErrorHandler(provider: PushErrorHandler): Disposable;
+	getPushErrorHandlers(): PushErrorHandler[];
+}

extensions/git/src/remoteSource.ts

@@ -0,0 +1,133 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { QuickPickItem, window, QuickPick } from 'vscode';
+import * as nls from 'vscode-nls';
+import { RemoteSourceProvider, RemoteSource } from './api/git';
+import { Model } from './model';
+import { throttle, debounce } from './decorators';
+
+const localize = nls.loadMessageBundle();
+
+async function getQuickPickResult<T extends QuickPickItem>(quickpick: QuickPick<T>): Promise<T | undefined> {
+	const result = await new Promise<T | undefined>(c => {
+		quickpick.onDidAccept(() => c(quickpick.selectedItems[0]));
+		quickpick.onDidHide(() => c(undefined));
+		quickpick.show();
+	});
+
+	quickpick.hide();
+	return result;
+}
+
+class RemoteSourceProviderQuickPick {
+
+	private quickpick: QuickPick<QuickPickItem & { remoteSource?: RemoteSource }>;
+
+	constructor(private provider: RemoteSourceProvider) {
+		this.quickpick = window.createQuickPick();
+		this.quickpick.ignoreFocusOut = true;
+
+		if (provider.supportsQuery) {
+			this.quickpick.placeholder = localize('type to search', "Repository name (type to search)");
+			this.quickpick.onDidChangeValue(this.onDidChangeValue, this);
+		} else {
+			this.quickpick.placeholder = localize('type to filter', "Repository name");
+		}
+	}
+
+	@debounce(300)
+	private onDidChangeValue(): void {
+		this.query();
+	}
+
+	@throttle
+	private async query(): Promise<void> {
+		this.quickpick.busy = true;
+
+		try {
+			const remoteSources = await this.provider.getRemoteSources(this.quickpick.value) || [];
+
+			if (remoteSources.length === 0) {
+				this.quickpick.items = [{
+					label: localize('none found', "No remote repositories found."),
+					alwaysShow: true
+				}];
+			} else {
+				this.quickpick.items = remoteSources.map(remoteSource => ({
+					label: remoteSource.name,
+					description: remoteSource.description || (typeof remoteSource.url === 'string' ? remoteSource.url : remoteSource.url[0]),
+					remoteSource
+				}));
+			}
+		} catch (err) {
+			this.quickpick.items = [{ label: localize('error', "$(error) Error: {0}", err.message), alwaysShow: true }];
+			console.error(err);
+		} finally {
+			this.quickpick.busy = false;
+		}
+	}
+
+	async pick(): Promise<RemoteSource | undefined> {
+		this.query();
+		const result = await getQuickPickResult(this.quickpick);
+		return result?.remoteSource;
+	}
+}
+
+export interface PickRemoteSourceOptions {
+	readonly providerLabel?: (provider: RemoteSourceProvider) => string;
+	readonly urlLabel?: string;
+}
+
+export async function pickRemoteSource(model: Model, options: PickRemoteSourceOptions = {}): Promise<string | undefined> {
+	const quickpick = window.createQuickPick<(QuickPickItem & { provider?: RemoteSourceProvider, url?: string })>();
+	quickpick.ignoreFocusOut = true;
+
+	const providers = model.getRemoteProviders()
+		.map(provider => ({ label: (provider.icon ? `$(${provider.icon}) ` : '') + (options.providerLabel ? options.providerLabel(provider) : provider.name), alwaysShow: true, provider }));
+
+	quickpick.placeholder = providers.length === 0
+		? localize('provide url', "Provide repository URL")
+		: localize('provide url or pick', "Provide repository URL or pick a repository source.");
+
+	const updatePicks = (value?: string) => {
+		if (value) {
+			quickpick.items = [{
+				label: options.urlLabel ?? localize('url', "URL"),
+				description: value,
+				alwaysShow: true,
+				url: value
+			},
+			...providers];
+		} else {
+			quickpick.items = providers;
+		}
+	};
+
+	quickpick.onDidChangeValue(updatePicks);
+	updatePicks();
+
+	const result = await getQuickPickResult(quickpick);
+
+	if (result) {
+		if (result.url) {
+			return result.url;
+		} else if (result.provider) {
+			const quickpick = new RemoteSourceProviderQuickPick(result.provider);
+			const remote = await quickpick.pick();
+
+			if (remote) {
+				if (typeof remote.url === 'string') {
+					return remote.url;
+				} else if (remote.url.length > 0) {
+					return await window.showQuickPick(remote.url, { ignoreFocusOut: true, placeHolder: localize('pick url', "Choose a URL to clone from.") });
+				}
+			}
+		}
+	}
+
+	return undefined;
+}

extensions/git/src/repository.ts

@@ -17,6 +17,8 @@ import { anyEvent, combinedDisposable, debounceEvent, dispose, EmptyDisposable,
 import { IFileWatcher, watch } from './watch';
 import { Log, LogLevel } from './log';
 import { IRemoteSourceProviderRegistry } from './remoteProvider';
+import { IPushErrorHandlerRegistry } from './pushError';
+import { ApiRepository } from './api/api1';
 
 const timeout = (millis: number) => new Promise(c => setTimeout(c, millis));
 
@@ -683,6 +685,7 @@ export class Repository implements Disposable {
 	constructor(
 		private readonly repository: BaseRepository,
 		remoteSourceProviderRegistry: IRemoteSourceProviderRegistry,
+		private pushErrorHandlerRegistry: IPushErrorHandlerRegistry,
 		globalState: Memento,
 		outputChannel: OutputChannel
 	) {
@@ -865,7 +868,7 @@ export class Repository implements Disposable {
 	}
 
 	async getInputTemplate(): Promise<string> {
-		const commitMessage = (await Promise.all([this.repository.getMergeMessage(), this.repository.getSquashMessage()])).find(msg => msg !== undefined);
+		const commitMessage = (await Promise.all([this.repository.getMergeMessage(), this.repository.getSquashMessage()])).find(msg => !!msg);
 
 		if (commitMessage) {
 			return commitMessage;
@@ -1181,15 +1184,15 @@ export class Repository implements Disposable {
 			branch = `${head.name}:${head.upstream.name}`;
 		}
 
-		await this.run(Operation.Push, () => this.repository.push(remote, branch, undefined, undefined, forcePushMode));
+		await this.run(Operation.Push, () => this._push(remote, branch, undefined, undefined, forcePushMode));
 	}
 
 	async pushTo(remote?: string, name?: string, setUpstream: boolean = false, forcePushMode?: ForcePushMode): Promise<void> {
-		await this.run(Operation.Push, () => this.repository.push(remote, name, setUpstream, undefined, forcePushMode));
+		await this.run(Operation.Push, () => this._push(remote, name, setUpstream, undefined, forcePushMode));
 	}
 
 	async pushFollowTags(remote?: string, forcePushMode?: ForcePushMode): Promise<void> {
-		await this.run(Operation.Push, () => this.repository.push(remote, undefined, false, true, forcePushMode));
+		await this.run(Operation.Push, () => this._push(remote, undefined, false, true, forcePushMode));
 	}
 
 	async blame(path: string): Promise<string> {
@@ -1249,7 +1252,7 @@ export class Repository implements Disposable {
 				const shouldPush = this.HEAD && (typeof this.HEAD.ahead === 'number' ? this.HEAD.ahead > 0 : true);
 
 				if (shouldPush) {
-					await this.repository.push(remoteName, pushBranch);
+					await this._push(remoteName, pushBranch);
 				}
 			});
 		});
@@ -1411,6 +1414,31 @@ export class Repository implements Disposable {
 		return ignored;
 	}
 
+	private async _push(remote?: string, refspec?: string, setUpstream: boolean = false, tags = false, forcePushMode?: ForcePushMode): Promise<void> {
+		try {
+			await this.repository.push(remote, refspec, setUpstream, tags, forcePushMode);
+		} catch (err) {
+			if (!remote || !refspec) {
+				throw err;
+			}
+
+			const repository = new ApiRepository(this);
+			const remoteObj = repository.state.remotes.find(r => r.name === remote);
+
+			if (!remoteObj) {
+				throw err;
+			}
+
+			for (const handler of this.pushErrorHandlerRegistry.getPushErrorHandlers()) {
+				if (await handler.handlePushError(repository, remoteObj, refspec, err)) {
+					return;
+				}
+			}
+
+			throw err;
+		}
+	}
+
 	private async run<T>(operation: Operation, runOperation: () => Promise<T> = () => Promise.resolve<any>(null)): Promise<T> {
 		if (this.state !== RepositoryState.Idle) {
 			throw new Error('Repository not initialized');

extensions/git/src/util.ts

@@ -44,18 +44,6 @@ export function filterEvent<T>(event: Event<T>, filter: (e: T) => boolean): Even
 	return (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => event(e => filter(e) && listener.call(thisArgs, e), null, disposables);
 }
 
-export function latchEvent<T>(event: Event<T>): Event<T> {
-	let firstCall = true;
-	let cache: T;
-
-	return filterEvent(event, value => {
-		let shouldEmit = firstCall || value !== cache;
-		firstCall = false;
-		cache = value;
-		return shouldEmit;
-	});
-}
-
 export function anyEvent<T>(...events: Event<T>[]): Event<T> {
 	return (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => {
 		const result = combinedDisposable(events.map(event => event(i => listener.call(thisArgs, i))));

extensions/git/yarn.lock

@@ -425,10 +425,10 @@ https-proxy-agent@^2.2.1:
     agent-base "^4.3.0"
     debug "^3.1.0"
 
-iconv-lite-umd@0.6.5:
+iconv-lite-umd@0.6.8:
-  version "0.6.5"
+  version "0.6.8"
-  resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.5.tgz#6a1f621a3b4d125f72feff813a9839e1ebd6c722"
+  resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.8.tgz#5ad310ec126b260621471a2d586f7f37b9958ec0"
-  integrity sha512-WDegH4al+e3n3jTOStRvm+jzDA3JMUQGgzdAsMxAgcgB0Oi72HjfdsoX08ieKsy3rKexXVjWZr41aOIUaCZnMg==
+  integrity sha512-zvXJ5gSwMC9JD3wDzH8CoZGc1pbiJn12Tqjk8BXYCnYz3hYL5GRjHW8LEykjXhV9WgNGI4rgpgHcbIiBfrRq6A==
 
 inflight@^1.0.4:
   version "1.0.6"
@@ -468,10 +468,10 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jschardet@2.1.1:
+jschardet@2.2.1:
-  version "2.1.1"
+  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-2.1.1.tgz#af6f8fd0b3b0f5d46a8fd9614a4fce490575c184"
+  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-2.2.1.tgz#03b0264669a90c7a5c436a68c5a7d4e4cb0c9823"
-  integrity sha512-pA5qG9Zwm8CBpGlK/lo2GE9jPxwqRgMV7Lzc/1iaPccw6v4Rhj8Zg2BTyrdmHmxlJojnbLupLeRnaPLsq03x6Q==
+  integrity sha512-Ks2JNuUJoc7PGaZ7bVFtSEvOcr0rBq6Q1J5/7+zKWLT+g+4zziL63O0jg7y2jxhzIa1LVsHUbPXrbaWmz9iwDw==
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"

extensions/github-authentication/src/extension.ts

@@ -24,19 +24,27 @@ export async function activate(context: vscode.ExtensionContext) {
 
 	vscode.authentication.registerAuthenticationProvider({
 		id: 'github',
-		displayName: 'GitHub',
+		label: 'GitHub',
 		supportsMultipleAccounts: false,
 		onDidChangeSessions: onDidChangeSessions.event,
 		getSessions: () => Promise.resolve(loginService.sessions),
 		login: async (scopeList: string[]) => {
 			try {
+				/* __GDPR__
+					"login" : { }
+				*/
 				telemetryReporter.sendTelemetryEvent('login');
+
 				const session = await loginService.login(scopeList.sort().join(' '));
 				Logger.info('Login success!');
 				onDidChangeSessions.fire({ added: [session.id], removed: [], changed: [] });
 				return session;
 			} catch (e) {
+				/* __GDPR__
+					"loginFailed" : { }
+				*/
 				telemetryReporter.sendTelemetryEvent('loginFailed');
+
 				vscode.window.showErrorMessage(`Sign in failed: ${e}`);
 				Logger.error(e);
 				throw e;
@@ -44,11 +52,19 @@ export async function activate(context: vscode.ExtensionContext) {
 		},
 		logout: async (id: string) => {
 			try {
+				/* __GDPR__
+					"logout" : { }
+				*/
 				telemetryReporter.sendTelemetryEvent('logout');
+
 				await loginService.logout(id);
 				onDidChangeSessions.fire({ added: [], removed: [id], changed: [] });
 			} catch (e) {
+				/* __GDPR__
+					"logoutFailed" : { }
+				*/
 				telemetryReporter.sendTelemetryEvent('logoutFailed');
+
 				vscode.window.showErrorMessage(`Sign out failed: ${e}`);
 				Logger.error(e);
 				throw e;

extensions/github-authentication/src/github.ts

@@ -14,7 +14,8 @@ export const onDidChangeSessions = new vscode.EventEmitter<vscode.Authentication
 interface SessionData {
 	id: string;
 	account?: {
-		displayName: string;
+		label?: string;
+		displayName?: string;
 		id: string;
 	}
 	scopes: string[];
@@ -95,7 +96,9 @@ export class GitHubAuthenticationProvider {
 					return {
 						id: session.id,
 						account: {
-							displayName: session.account?.displayName ?? userInfo!.accountName,
+							label: session.account
+								? session.account.label || session.account.displayName!
+								: userInfo!.accountName,
 							id: session.account?.id ?? userInfo!.id
 						},
 						scopes: session.scopes,
@@ -138,7 +141,7 @@ export class GitHubAuthenticationProvider {
 
 	private async tokenToSession(token: string, scopes: string[]): Promise<vscode.AuthenticationSession> {
 		const userInfo = await this._githubServer.getUserInfo(token);
-		return new vscode.AuthenticationSession(uuid(), token, { displayName: userInfo.accountName, id: userInfo.id }, scopes);
+		return new vscode.AuthenticationSession(uuid(), token, { label: userInfo.accountName, id: userInfo.id }, scopes);
 	}
 
 	private async setToken(session: vscode.AuthenticationSession): Promise<void> {

extensions/github-browser/package.json

@@ -21,6 +21,11 @@
   "main": "./out/extension.js",
   "contributes": {
     "commands": [
+      {
+        "command": "githubBrowser.openRepository",
+        "title": "Open GitHub Repository...",
+        "category": "GitHub Browser"
+      },
       {
         "command": "githubBrowser.commit",
         "title": "Commit",
@@ -48,6 +53,10 @@
     ],
     "menus": {
       "commandPalette": [
+        {
+          "command": "githubBrowser.openRepository",
+          "when": "config.githubBrowser.openRepository"
+        },
         {
           "command": "githubBrowser.commit",
           "when": "false"

extensions/github-browser/src/changeStore.ts

@@ -47,31 +47,17 @@ function fromSerialized(operations: StoredOperation): Operation {
 	return { ...operations, uri: Uri.parse(operations.uri) };
 }
 
-interface CreatedFileChangeStoreEvent {
+export interface ChangeStoreEvent {
-	type: 'created';
+	type: 'created' | 'changed' | 'deleted';
 	rootUri: Uri;
 	uri: Uri;
 }
 
-interface ChangedFileChangeStoreEvent {
-	type: 'changed';
-	rootUri: Uri;
-	uri: Uri;
-}
-
-interface DeletedFileChangeStoreEvent {
-	type: 'deleted';
-	rootUri: Uri;
-	uri: Uri;
-}
-
-type ChangeStoreEvent = CreatedFileChangeStoreEvent | ChangedFileChangeStoreEvent | DeletedFileChangeStoreEvent;
-
 function toChangeStoreEvent(operation: Operation | StoredOperation, rootUri: Uri, uri?: Uri): ChangeStoreEvent {
 	return {
 		type: operation.type,
 		rootUri: rootUri,
-		uri: uri ?? (typeof operation.uri === 'string' ? Uri.parse(operation.uri) : operation.uri)
+		uri: uri ?? (typeof operation.uri === 'string' ? Uri.parse(operation.uri) : operation.uri),
 	};
 }
 
@@ -82,6 +68,8 @@ export interface IChangeStore {
 	discard(uri: Uri): Promise<void>;
 	discardAll(rootUri: Uri): Promise<void>;
 
+	hasChanges(rootUri: Uri): boolean;
+
 	getChanges(rootUri: Uri): Operation[];
 	getContent(uri: Uri): string | undefined;
 
@@ -116,9 +104,15 @@ export class ChangeStore implements IChangeStore, IWritableChangeStore {
 
 		await this.saveWorkingOperations(rootUri, undefined);
 
+		const events: ChangeStoreEvent[] = [];
+
 		for (const operation of operations) {
 			await this.discardWorkingContent(operation.uri);
-			this._onDidChange.fire(toChangeStoreEvent(operation, rootUri));
+			events.push(toChangeStoreEvent(operation, rootUri));
+		}
+
+		for (const e of events) {
+			this._onDidChange.fire(e);
 		}
 	}
 
@@ -143,7 +137,7 @@ export class ChangeStore implements IChangeStore, IWritableChangeStore {
 		this._onDidChange.fire({
 			type: operation.type === 'created' ? 'deleted' : operation.type === 'deleted' ? 'created' : 'changed',
 			rootUri: rootUri,
-			uri: uri
+			uri: uri,
 		});
 	}
 
@@ -152,9 +146,15 @@ export class ChangeStore implements IChangeStore, IWritableChangeStore {
 
 		await this.saveWorkingOperations(rootUri, undefined);
 
+		const events: ChangeStoreEvent[] = [];
+
 		for (const operation of operations) {
 			await this.discardWorkingContent(operation.uri);
-			this._onDidChange.fire(toChangeStoreEvent(operation, rootUri));
+			events.push(toChangeStoreEvent(operation, rootUri));
+		}
+
+		for (const e of events) {
+			this._onDidChange.fire(e);
 		}
 	}
 

extensions/github-browser/src/contextStore.ts

@@ -4,9 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 'use strict';
-import { Event, EventEmitter, Memento, Uri } from 'vscode';
+import { Event, EventEmitter, Memento, Uri, workspace } from 'vscode';
 
-export const contextKeyPrefix = 'github.context|';
+export interface WorkspaceFolderContext<T> {
+	context: T;
+	name: string;
+	folderUri: Uri;
+}
 
 export class ContextStore<T> {
 	private _onDidChange = new EventEmitter<Uri>();
@@ -14,23 +18,36 @@ export class ContextStore<T> {
 		return this._onDidChange.event;
 	}
 
-	constructor(private readonly memento: Memento, private readonly scheme: string) { }
+	constructor(
+		private readonly scheme: string,
+		private readonly originalScheme: string,
+		private readonly memento: Memento,
+	) { }
 
 	delete(uri: Uri) {
 		return this.set(uri, undefined);
 	}
 
 	get(uri: Uri): T | undefined {
-		return this.memento.get<T>(`${contextKeyPrefix}${uri.toString()}`);
+		return this.memento.get<T>(`${this.originalScheme}.context|${this.getOriginalResource(uri).toString()}`);
 	}
 
+	getForWorkspace(): WorkspaceFolderContext<T>[] {
+		const folders = workspace.workspaceFolders?.filter(f => f.uri.scheme === this.scheme || f.uri.scheme === this.originalScheme) ?? [];
+		return folders.map(f => ({ context: this.get(f.uri)!, name: f.name, folderUri: f.uri })).filter(c => c.context !== undefined);
+	}
 
 	async set(uri: Uri, context: T | undefined) {
-		if (uri.scheme !== this.scheme) {
+		uri = this.getOriginalResource(uri);
-			throw new Error(`Invalid context scheme: ${uri.scheme}`);
+		await this.memento.update(`${this.originalScheme}.context|${uri.toString()}`, context);
-		}
-
-		await this.memento.update(`${contextKeyPrefix}${uri.toString()}`, context);
 		this._onDidChange.fire(uri);
 	}
+
+	getOriginalResource(uri: Uri): Uri {
+		return uri.with({ scheme: this.originalScheme });
+	}
+
+	getWorkspaceResource(uri: Uri): Uri {
+		return uri.with({ scheme: this.scheme });
+	}
 }

extensions/github-browser/src/extension.ts

@@ -3,48 +3,50 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionContext, Uri, workspace } from 'vscode';
+import { commands, ExtensionContext, Uri, window, workspace } from 'vscode';
 import { ChangeStore } from './changeStore';
 import { ContextStore } from './contextStore';
 import { VirtualFS } from './fs';
 import { GitHubApiContext, GitHubApi } from './github/api';
 import { GitHubFS } from './github/fs';
 import { VirtualSCM } from './scm';
+import { StatusBar } from './statusbar';
 
-// const repositoryRegex = /^(?:(?:https:\/\/)?github.com\/)?([^\/]+)\/([^\/]+?)(?:\/|.git|$)/i;
+const repositoryRegex = /^(?:(?:https:\/\/)?github.com\/)?([^\/]+)\/([^\/]+?)(?:\/|.git|$)/i;
 
-export function activate(context: ExtensionContext) {
+export async function activate(context: ExtensionContext) {
-	const contextStore = new ContextStore<GitHubApiContext>(context.workspaceState, GitHubFS.scheme);
+	const contextStore = new ContextStore<GitHubApiContext>('codespace', GitHubFS.scheme, context.workspaceState);
 	const changeStore = new ChangeStore(context.workspaceState);
 
 	const githubApi = new GitHubApi(contextStore);
 	const gitHubFS = new GitHubFS(githubApi);
-	const virtualFS = new VirtualFS('codespace', GitHubFS.scheme, contextStore, changeStore, gitHubFS);
+	const virtualFS = new VirtualFS('codespace', contextStore, changeStore, gitHubFS);
 
 	context.subscriptions.push(
 		githubApi,
 		gitHubFS,
 		virtualFS,
-		new VirtualSCM(GitHubFS.scheme, githubApi, changeStore)
+		new VirtualSCM(GitHubFS.scheme, githubApi, changeStore),
+		new StatusBar(contextStore, changeStore),
 	);
 
-	// commands.registerCommand('githubBrowser.openRepository', async () => {
+	commands.registerCommand('githubBrowser.openRepository', async () => {
-	// 	const value = await window.showInputBox({
+		const value = await window.showInputBox({
-	// 		placeHolder: 'e.g. https://github.com/microsoft/vscode',
+			placeHolder: 'e.g. https://github.com/microsoft/vscode',
-	// 		prompt: 'Enter a GitHub repository url',
+			prompt: 'Enter a GitHub repository url',
-	// 		validateInput: value => repositoryRegex.test(value) ? undefined : 'Invalid repository url'
+			validateInput: value => repositoryRegex.test(value) ? undefined : 'Invalid repository url'
-	// 	});
+		});
 
-	// 	if (value) {
+		if (value) {
-	// 		const match = repositoryRegex.exec(value);
+			const match = repositoryRegex.exec(value);
-	// 		if (match) {
+			if (match) {
-	// 			const [, owner, repo] = match;
+				const [, owner, repo] = match;
 
-	// 			const uri = Uri.parse(`codespace://HEAD/${owner}/${repo}`);
+				const uri = Uri.parse(`codespace://HEAD/${owner}/${repo}`);
-	// 			openWorkspace(uri, repo, 'currentWindow');
+				openWorkspace(uri, repo, 'currentWindow');
-	// 		}
+			}
-	// 	}
+		}
-	// });
+	});
 }
 
 export function getRelativePath(rootUri: Uri, uri: Uri) {
@@ -63,11 +65,16 @@ export function isDescendent(folderPath: string, filePath: string) {
 	return folderPath.length === 0 || filePath.startsWith(folderPath.endsWith('/') ? folderPath : `${folderPath}/`);
 }
 
-// function openWorkspace(uri: Uri, name: string, location: 'currentWindow' | 'newWindow' | 'addToCurrentWorkspace') {
+const shaRegex = /^[0-9a-f]{40}$/;
-// 	if (location === 'addToCurrentWorkspace') {
+export function isSha(ref: string) {
-// 		const count = (workspace.workspaceFolders && workspace.workspaceFolders.length) || 0;
+	return shaRegex.test(ref);
-// 		return workspace.updateWorkspaceFolders(count, 0, { uri: uri, name: name });
+}
-// 	}
 
-// 	return commands.executeCommand('vscode.openFolder', uri, location === 'newWindow');
+function openWorkspace(uri: Uri, name: string, location: 'currentWindow' | 'newWindow' | 'addToCurrentWorkspace') {
-// }
+	if (location === 'addToCurrentWorkspace') {
+		const count = (workspace.workspaceFolders && workspace.workspaceFolders.length) || 0;
+		return workspace.updateWorkspaceFolders(count, 0, { uri: uri, name: name });
+	}
+
+	return commands.executeCommand('vscode.openFolder', uri, location === 'newWindow');
+}

extensions/github-browser/src/fs.ts

@@ -43,26 +43,22 @@ export class VirtualFS implements FileSystemProvider, FileSearchProvider, TextSe
 
 	constructor(
 		readonly scheme: string,
-		private readonly originalScheme: string,
+		private readonly contextStore: ContextStore<GitHubApiContext>,
-		contextStore: ContextStore<GitHubApiContext>,
 		private readonly changeStore: IWritableChangeStore,
 		private readonly fs: FileSystemProvider & FileSearchProvider & TextSearchProvider
 	) {
 		// TODO@eamodio listen for workspace folder changes
-		for (const folder of workspace.workspaceFolders ?? []) {
+		for (const context of contextStore.getForWorkspace()) {
-			const uri = this.getOriginalResource(folder.uri);
-
 			// If we have a saved context, but no longer have any changes, reset the context
 			// We only do this on startup/reload to keep things consistent
-			if (contextStore.get(uri) !== undefined && !changeStore.hasChanges(folder.uri)) {
+			if (!changeStore.hasChanges(context.folderUri)) {
-				contextStore.delete(uri);
+				console.log('Clear context', context.folderUri.toString());
+				contextStore.delete(context.folderUri);
 			}
 		}
 
 		this.disposable = Disposable.from(
-			workspace.registerFileSystemProvider(scheme, this, {
+			workspace.registerFileSystemProvider(scheme, this, { isCaseSensitive: true }),
-				isCaseSensitive: true,
-			}),
 			workspace.registerFileSearchProvider(scheme, this),
 			workspace.registerTextSearchProvider(scheme, this),
 			changeStore.onDidChange(e => {
@@ -86,11 +82,11 @@ export class VirtualFS implements FileSystemProvider, FileSearchProvider, TextSe
 	}
 
 	private getOriginalResource(uri: Uri): Uri {
-		return uri.with({ scheme: this.originalScheme });
+		return this.contextStore.getOriginalResource(uri);
 	}
 
-	private getVirtualResource(uri: Uri): Uri {
+	private getWorkspaceResource(uri: Uri): Uri {
-		return uri.with({ scheme: this.scheme });
+		return this.contextStore.getWorkspaceResource(uri);
 	}
 
 	//#region FileSystemProvider
@@ -211,7 +207,7 @@ export class VirtualFS implements FileSystemProvider, FileSearchProvider, TextSe
 		return this.fs.provideTextSearchResults(
 			query,
 			{ ...options, folder: this.getOriginalResource(options.folder) },
-			{ report: (result: TextSearchResult) => progress.report({ ...result, uri: this.getVirtualResource(result.uri) }) },
+			{ report: (result: TextSearchResult) => progress.report({ ...result, uri: this.getWorkspaceResource(result.uri) }) },
 			token
 		);
 	}

extensions/github-browser/src/github/api.ts

@@ -6,14 +6,16 @@
 import { authentication, AuthenticationSession, Disposable, Event, EventEmitter, Range, Uri } from 'vscode';
 import { graphql } from '@octokit/graphql';
 import { Octokit } from '@octokit/rest';
-import { fromGitHubUri } from './fs';
 import { ContextStore } from '../contextStore';
+import { fromGitHubUri } from './fs';
+import { isSha } from '../extension';
 import { Iterables } from '../iterables';
 
-export const shaRegex = /^[0-9a-f]{40}$/;
-
 export interface GitHubApiContext {
-	sha: string;
+	requestRef: string;
+
+	branch: string;
+	sha: string | undefined;
 	timestamp: number;
 }
 
@@ -73,7 +75,7 @@ export class GitHubApi implements Disposable {
 			if (!providers.includes('github')) {
 				await new Promise(resolve => {
 					authentication.onDidChangeAuthenticationProviders(e => {
-						if (e.added.includes('github')) {
+						if (e.added.find(provider => provider.id === 'github')) {
 							resolve();
 						}
 					});
@@ -110,19 +112,12 @@ export class GitHubApi implements Disposable {
 	}
 
 	async commit(rootUri: Uri, message: string, operations: CommitOperation[]): Promise<string | undefined> {
-		let { owner, repo, ref } = fromGitHubUri(rootUri);
+		const { owner, repo } = fromGitHubUri(rootUri);
 
 		try {
-			if (ref === undefined || ref === 'HEAD') {
-				ref = await this.defaultBranchQuery(rootUri);
-				if (ref === undefined) {
-					throw new Error('Cannot commit — invalid ref');
-				}
-			}
-
 			const context = await this.getContext(rootUri);
 			if (context.sha === undefined) {
-				throw new Error('Cannot commit — invalid context');
+				throw new Error(`Cannot commit to Uri(${rootUri.toString(true)}); Invalid context sha`);
 			}
 
 			const hasDeletes = operations.some(op => op.type === 'deleted');
@@ -204,14 +199,14 @@ export class GitHubApi implements Disposable {
 				parents: [context.sha]
 			});
 
-			this.updateContext(rootUri, { sha: resp.data.sha, timestamp: Date.now() });
+			this.updateContext(rootUri, { ...context, sha: resp.data.sha, timestamp: Date.now() });
 
 			// TODO@eamodio need to send a file change for any open files
 
 			await github.git.updateRef({
 				owner: owner,
 				repo: repo,
-				ref: `heads/${ref}`,
+				ref: `heads/${context.branch}`,
 				sha: resp.data.sha
 			});
 
@@ -256,7 +251,7 @@ export class GitHubApi implements Disposable {
 				owner: owner,
 				repo: repo,
 				recursive: '1',
-				tree_sha: context?.sha ?? ref ?? 'HEAD',
+				tree_sha: context?.sha ?? ref,
 			});
 			return Iterables.filterMap(resp.data.tree, p => p.type === 'blob' ? p.path : undefined);
 		} catch (ex) {
@@ -283,7 +278,7 @@ export class GitHubApi implements Disposable {
 			}>(query, {
 				owner: owner,
 				repo: repo,
-				path: `${context.sha ?? ref ?? 'HEAD'}:${path}`,
+				path: `${context.sha ?? ref}:${path}`,
 			});
 			return rsp?.repository?.object ?? undefined;
 		} catch (ex) {
@@ -295,7 +290,7 @@ export class GitHubApi implements Disposable {
 		const { owner, repo, ref } = fromGitHubUri(uri);
 
 		try {
-			if (ref === undefined || ref === 'HEAD') {
+			if (ref === 'HEAD') {
 				const query = `query latest($owner: String!, $repo: String!) {
 	repository(owner: $owner, name: $repo) {
 		defaultBranchRef {
@@ -322,6 +317,7 @@ export class GitHubApi implements Disposable {
 				oid
 			}
 		}
+	}
 }`;
 
 			const rsp = await this.gqlQuery<{
@@ -345,7 +341,7 @@ export class GitHubApi implements Disposable {
 		const { owner, repo, ref } = fromGitHubUri(uri);
 
 		// If we have a specific ref, don't try to search, because GitHub search only works against the default branch
-		if (ref === undefined) {
+		if (ref !== 'HEAD') {
 			return { matches: [], limitHit: true };
 		}
 
@@ -436,29 +432,46 @@ export class GitHubApi implements Disposable {
 	private readonly rootUriToContextMap = new Map<string, GitHubApiContext>();
 
 	private async getContextCore(rootUri: Uri): Promise<GitHubApiContext> {
-		let context = this.rootUriToContextMap.get(rootUri.toString());
+		const key = rootUri.toString();
-		if (context === undefined) {
+		let context = this.rootUriToContextMap.get(key);
-			const { ref } = fromGitHubUri(rootUri);
-			if (ref !== undefined && shaRegex.test(ref)) {
-				context = { sha: ref, timestamp: Date.now() };
-			} else {
-				context = this.context.get(rootUri);
-				if (context?.sha === undefined) {
-					const sha = await this.latestCommitQuery(rootUri);
-					if (sha !== undefined) {
-						context = { sha: sha, timestamp: Date.now() };
-					} else {
-						context = undefined;
-					}
-				}
-			}
 
-			if (context !== undefined) {
+		// Check if we have a cached a context
-				this.updateContext(rootUri, context);
+		if (context?.sha !== undefined) {
-			}
+			return context;
 		}
 
-		return context ?? { sha: rootUri.authority, timestamp: Date.now() };
+		// Check if we have a saved context
+		context = this.context.get(rootUri);
+		if (context?.sha !== undefined) {
+			this.rootUriToContextMap.set(key, context);
+
+			return context;
+		}
+
+		const { ref } = fromGitHubUri(rootUri);
+
+		// If the requested ref looks like a sha, then use it
+		if (isSha(ref)) {
+			context = { requestRef: ref, branch: ref, sha: ref, timestamp: Date.now() };
+		} else {
+			let branch;
+			if (ref === 'HEAD') {
+				branch = await this.defaultBranchQuery(rootUri);
+				if (branch === undefined) {
+					throw new Error(`Cannot get context for Uri(${rootUri.toString(true)}); unable to get default branch`);
+				}
+			} else {
+				branch = ref;
+			}
+
+			// Query for the latest sha for the give ref
+			const sha = await this.latestCommitQuery(rootUri);
+			context = { requestRef: ref, branch: branch, sha: sha, timestamp: Date.now() };
+		}
+
+		this.updateContext(rootUri, context);
+
+		return context;
 	}
 
 	private updateContext(rootUri: Uri, context: GitHubApiContext) {

extensions/github-browser/src/github/fs.ts

@@ -299,7 +299,7 @@ function typenameToFileType(typename: string | undefined | null) {
 	}
 }
 
-type RepoInfo = { owner: string; repo: string; path: string | undefined; ref?: string };
+type RepoInfo = { owner: string; repo: string; path: string | undefined; ref: string };
 export function fromGitHubUri(uri: Uri): RepoInfo {
 	const [, owner, repo, ...rest] = uri.path.split('/');
 
@@ -311,7 +311,7 @@ export function fromGitHubUri(uri: Uri): RepoInfo {
 			ref = 'HEAD';
 		}
 	}
-	return { owner: owner, repo: repo, path: rest.join('/'), ref: ref };
+	return { owner: owner, repo: repo, path: rest.join('/'), ref: ref ?? 'HEAD' };
 }
 
 function getHashCode(s: string): number {

extensions/github-browser/src/iterables.ts

@@ -12,8 +12,9 @@ export namespace Iterables {
 	): Iterable<TMapped> {
 		for (const item of source) {
 			const mapped = predicateMapper(item);
-			// eslint-disable-next-line eqeqeq
+			if (mapped !== undefined && mapped !== null) {
-			if (mapped != null) { yield mapped; }
+				yield mapped;
+			}
 		}
 	}
 

extensions/github-browser/src/scm.ts

@@ -32,17 +32,15 @@ export class VirtualSCM implements Disposable {
 		// TODO@eamodio listen for workspace folder changes
 		for (const folder of workspace.workspaceFolders ?? []) {
 			this.createScmProvider(folder.uri, folder.name);
+
+			for (const operation of changeStore.getChanges(folder.uri)) {
+				this.update(folder.uri, operation.uri);
+			}
 		}
 
 		this.disposable = Disposable.from(
 			changeStore.onDidChange(e => this.update(e.rootUri, e.uri)),
 		);
-
-		for (const { uri } of workspace.workspaceFolders ?? []) {
-			for (const operation of changeStore.getChanges(uri)) {
-				this.update(uri, operation.uri);
-			}
-		}
 	}
 
 	dispose() {
@@ -50,7 +48,18 @@ export class VirtualSCM implements Disposable {
 	}
 
 	private registerCommands() {
-		commands.registerCommand('githubBrowser.commit', (...args: any[]) => this.commitChanges(args[0]));
+		commands.registerCommand('githubBrowser.commit', (sourceControl: SourceControl | undefined) => {
+			// TODO@eamodio remove this hack once I figure out why the args are missing
+			if (sourceControl === undefined && this.providers.length === 1) {
+				sourceControl = this.providers[0].sourceControl;
+			}
+
+			if (sourceControl === undefined) {
+				return;
+			}
+
+			this.commitChanges(sourceControl);
+		});
 
 		commands.registerCommand('githubBrowser.discardChanges', (resourceState: SourceControlResourceState) =>
 			this.discardChanges(resourceState.resourceUri)

extensions/github-browser/src/statusbar.ts

@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+import { Disposable, StatusBarAlignment, StatusBarItem, Uri, window, workspace } from 'vscode';
+import { ChangeStoreEvent, IChangeStore } from './changeStore';
+import { GitHubApiContext } from './github/api';
+import { isSha } from './extension';
+import { ContextStore, WorkspaceFolderContext } from './contextStore';
+
+export class StatusBar implements Disposable {
+	private readonly disposable: Disposable;
+
+	private readonly items = new Map<string, StatusBarItem>();
+
+	constructor(
+		private readonly contextStore: ContextStore<GitHubApiContext>,
+		private readonly changeStore: IChangeStore
+	) {
+		this.disposable = Disposable.from(
+			contextStore.onDidChange(this.onContextsChanged, this),
+			changeStore.onDidChange(this.onChanged, this)
+		);
+
+		for (const context of this.contextStore.getForWorkspace()) {
+			this.createOrUpdateStatusBarItem(context);
+		}
+	}
+
+	dispose() {
+		this.disposable?.dispose();
+		this.items.forEach(i => i.dispose());
+	}
+
+	private createOrUpdateStatusBarItem(wc: WorkspaceFolderContext<GitHubApiContext>) {
+		let item = this.items.get(wc.folderUri.toString());
+		if (item === undefined) {
+			item = window.createStatusBarItem({
+				id: `githubBrowser.branch:${wc.folderUri.toString()}`,
+				name: `GitHub Browser: ${wc.name}`,
+				alignment: StatusBarAlignment.Left,
+				priority: 1000
+			});
+		}
+
+		if (isSha(wc.context.branch)) {
+			item.text = `$(git-commit) ${wc.context.branch.substr(0, 8)}`;
+			item.tooltip = `${wc.name} \u2022 ${wc.context.branch.substr(0, 8)}`;
+		} else {
+			item.text = `$(git-branch) ${wc.context.branch}`;
+			item.tooltip = `${wc.name} \u2022 ${wc.context.branch}${wc.context.sha ? ` @ ${wc.context.sha?.substr(0, 8)}` : ''}`;
+		}
+
+		const hasChanges = this.changeStore.hasChanges(wc.folderUri);
+		if (hasChanges) {
+			item.text += '*';
+		}
+
+		item.show();
+
+		this.items.set(wc.folderUri.toString(), item);
+	}
+
+	private onContextsChanged(uri: Uri) {
+		const folder = workspace.getWorkspaceFolder(this.contextStore.getWorkspaceResource(uri));
+		if (folder === undefined) {
+			return;
+		}
+
+		const context = this.contextStore.get(uri);
+		if (context === undefined) {
+			return;
+		}
+
+		this.createOrUpdateStatusBarItem({
+			context: context,
+			name: folder.name,
+			folderUri: folder.uri,
+		});
+	}
+
+	private onChanged(e: ChangeStoreEvent) {
+		const item = this.items.get(e.rootUri.toString());
+		if (item !== undefined) {
+			const hasChanges = this.changeStore.hasChanges(e.rootUri);
+			if (hasChanges) {
+				if (!item.text.endsWith('*')) {
+					item.text += '*';
+				}
+			} else {
+				if (item.text.endsWith('*')) {
+					item.text = item.text.substr(0, item.text.length - 1);
+				}
+			}
+		}
+	}
+}

extensions/github/src/commands.ts

@@ -6,9 +6,10 @@
 import * as vscode from 'vscode';
 import { API as GitAPI } from './typings/git';
 import { publishRepository } from './publish';
+import { combinedDisposable } from './util';
 
-export function registerCommands(gitAPI: GitAPI): vscode.Disposable[] {
+export function registerCommands(gitAPI: GitAPI): vscode.Disposable {
-	const disposables = [];
+	const disposables: vscode.Disposable[] = [];
 
 	disposables.push(vscode.commands.registerCommand('github.publish', async () => {
 		try {
@@ -18,5 +19,5 @@ export function registerCommands(gitAPI: GitAPI): vscode.Disposable[] {
 		}
 	}));
 
-	return disposables;
+	return combinedDisposable(disposables);
 }

extensions/github/src/extension.ts

@@ -3,23 +3,43 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
+import { Disposable, ExtensionContext, extensions } from 'vscode';
 import { GithubRemoteSourceProvider } from './remoteSourceProvider';
 import { GitExtension } from './typings/git';
 import { registerCommands } from './commands';
 import { GithubCredentialProviderManager } from './credentialProvider';
+import { dispose, combinedDisposable } from './util';
+import { GithubPushErrorHandler } from './pushErrorHandler';
 
-export async function activate(context: vscode.ExtensionContext) {
+export function activate(context: ExtensionContext): void {
-	const gitExtension = vscode.extensions.getExtension<GitExtension>('vscode.git')!.exports;
+	const disposables = new Set<Disposable>();
+	context.subscriptions.push(combinedDisposable(disposables));
 
-	try {
+	const init = () => {
-		const gitAPI = gitExtension.getAPI(1);
+		try {
+			const gitAPI = gitExtension.getAPI(1);
 
-		context.subscriptions.push(...registerCommands(gitAPI));
+			disposables.add(registerCommands(gitAPI));
-		context.subscriptions.push(gitAPI.registerRemoteSourceProvider(new GithubRemoteSourceProvider(gitAPI)));
+			disposables.add(gitAPI.registerRemoteSourceProvider(new GithubRemoteSourceProvider(gitAPI)));
-		context.subscriptions.push(new GithubCredentialProviderManager(gitAPI));
+			disposables.add(new GithubCredentialProviderManager(gitAPI));
-	} catch (err) {
+			disposables.add(gitAPI.registerPushErrorHandler(new GithubPushErrorHandler()));
-		console.error('Could not initialize GitHub extension');
+		} catch (err) {
-		console.warn(err);
+			console.error('Could not initialize GitHub extension');
-	}
+			console.warn(err);
+		}
+	};
+
+	const onDidChangeGitExtensionEnablement = (enabled: boolean) => {
+		if (!enabled) {
+			dispose(disposables);
+			disposables.clear();
+		} else {
+			init();
+		}
+	};
+
+
+	const gitExtension = extensions.getExtension<GitExtension>('vscode.git')!.exports;
+	context.subscriptions.push(gitExtension.onDidChangeEnablement(onDidChangeGitExtensionEnablement));
+	onDidChangeGitExtensionEnablement(gitExtension.enabled);
 }

extensions/github/src/publish.ts

@@ -5,10 +5,10 @@
 
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
-import * as path from 'path';
-import { promises as fs } from 'fs';
 import { API as GitAPI, Repository } from './typings/git';
 import { getOctokit } from './auth';
+import { TextEncoder } from 'util';
+import { basename } from 'path';
 
 const localize = nls.loadMessageBundle();
 
@@ -28,10 +28,12 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 		return;
 	}
 
-	let folder: vscode.WorkspaceFolder;
+	let folder: vscode.Uri;
 
-	if (vscode.workspace.workspaceFolders.length === 1) {
+	if (repository) {
-		folder = vscode.workspace.workspaceFolders[0];
+		folder = repository.rootUri;
+	} else if (vscode.workspace.workspaceFolders.length === 1) {
+		folder = vscode.workspace.workspaceFolders[0].uri;
 	} else {
 		const picks = vscode.workspace.workspaceFolders.map(folder => ({ label: folder.name, folder }));
 		const placeHolder = localize('pick folder', "Pick a folder to publish to GitHub");
@@ -41,14 +43,14 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 			return;
 		}
 
-		folder = pick.folder;
+		folder = pick.folder.uri;
 	}
 
 	let quickpick = vscode.window.createQuickPick<vscode.QuickPickItem & { repo?: string, auth?: 'https' | 'ssh' }>();
 	quickpick.ignoreFocusOut = true;
 
 	quickpick.placeholder = 'Repository Name';
-	quickpick.value = folder.name;
+	quickpick.value = basename(folder.fsPath);
 	quickpick.show();
 	quickpick.busy = true;
 
@@ -97,37 +99,49 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 		return;
 	}
 
-	quickpick = vscode.window.createQuickPick();
+	if (!repository) {
-	quickpick.placeholder = localize('ignore', "Select which files should be included in the repository.");
+		const gitignore = vscode.Uri.joinPath(folder, '.gitignore');
-	quickpick.canSelectMany = true;
+		let shouldGenerateGitignore = false;
-	quickpick.show();
 
-	try {
+		try {
-		quickpick.busy = true;
+			await vscode.workspace.fs.stat(gitignore);
-
+		} catch (err) {
-		const repositoryPath = folder.uri.fsPath;
+			shouldGenerateGitignore = true;
-		const currentPath = path.join(repositoryPath);
-		const children = await fs.readdir(currentPath);
-		quickpick.items = children.map(name => ({ label: name }));
-		quickpick.selectedItems = quickpick.items;
-		quickpick.busy = false;
-
-		const result = await Promise.race([
-			new Promise<readonly vscode.QuickPickItem[]>(c => quickpick.onDidAccept(() => c(quickpick.selectedItems))),
-			new Promise<undefined>(c => quickpick.onDidHide(() => c(undefined)))
-		]);
-
-		if (!result) {
-			return;
 		}
 
-		const ignored = new Set(children);
+		if (shouldGenerateGitignore) {
-		result.forEach(c => ignored.delete(c.label));
+			quickpick = vscode.window.createQuickPick();
+			quickpick.placeholder = localize('ignore', "Select which files should be included in the repository.");
+			quickpick.canSelectMany = true;
+			quickpick.show();
 
-		const raw = [...ignored].map(i => `/${i}`).join('\n');
+			try {
-		await fs.writeFile(path.join(repositoryPath, '.gitignore'), raw, 'utf8');
+				quickpick.busy = true;
-	} finally {
+
-		quickpick.dispose();
+				const children = (await vscode.workspace.fs.readDirectory(folder)).map(([name]) => name);
+				quickpick.items = children.map(name => ({ label: name }));
+				quickpick.selectedItems = quickpick.items;
+				quickpick.busy = false;
+
+				const result = await Promise.race([
+					new Promise<readonly vscode.QuickPickItem[]>(c => quickpick.onDidAccept(() => c(quickpick.selectedItems))),
+					new Promise<undefined>(c => quickpick.onDidHide(() => c(undefined)))
+				]);
+
+				if (!result) {
+					return;
+				}
+
+				const ignored = new Set(children);
+				result.forEach(c => ignored.delete(c.label));
+
+				const raw = [...ignored].map(i => `/${i}`).join('\n');
+				const encoder = new TextEncoder();
+				await vscode.workspace.fs.writeFile(gitignore, encoder.encode(raw));
+			} finally {
+				quickpick.dispose();
+			}
+		}
 	}
 
 	const githubRepository = await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification, cancellable: false, title: 'Publish to GitHub' }, async progress => {
@@ -143,7 +157,7 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 		progress.report({ message: 'Creating first commit', increment: 25 });
 
 		if (!repository) {
-			repository = await gitAPI.init(folder.uri) || undefined;
+			repository = await gitAPI.init(folder) || undefined;
 
 			if (!repository) {
 				return;

extensions/github/src/pushErrorHandler.ts

@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { PushErrorHandler, GitErrorCodes, Repository, Remote } from './typings/git';
+import { window, ProgressLocation, commands, Uri } from 'vscode';
+import * as nls from 'vscode-nls';
+import { getOctokit } from './auth';
+
+const localize = nls.loadMessageBundle();
+
+async function handlePushError(repository: Repository, remote: Remote, refspec: string, owner: string, repo: string): Promise<void> {
+	const yes = localize('create a fork', "Create Fork");
+	const no = localize('no', "No");
+
+	const answer = await window.showInformationMessage(localize('fork', "You don't have permissions to push to '{0}/{1}' on GitHub. Would you like to create a fork and push to it instead?", owner, repo), yes, no);
+
+	if (answer === no) {
+		return;
+	}
+
+	const match = /^([^:]*):([^:]*)$/.exec(refspec);
+	const localName = match ? match[1] : refspec;
+	const remoteName = match ? match[2] : refspec;
+
+	const [octokit, ghRepository] = await window.withProgress({ location: ProgressLocation.Notification, cancellable: false, title: localize('create fork', 'Create GitHub fork') }, async progress => {
+		progress.report({ message: localize('forking', "Forking '{0}/{1}'...", owner, repo), increment: 33 });
+
+		const octokit = await getOctokit();
+
+		// Issue: what if the repo already exists?
+		const res = await octokit.repos.createFork({ owner, repo });
+		const ghRepository = res.data;
+
+		progress.report({ message: localize('pushing', "Pushing changes..."), increment: 33 });
+
+		// Issue: what if there's already an `upstream` repo?
+		await repository.renameRemote(remote.name, 'upstream');
+
+		// Issue: what if there's already another `origin` repo?
+		await repository.addRemote('origin', ghRepository.clone_url);
+		await repository.fetch('origin', remoteName);
+		await repository.setBranchUpstream(localName, `origin/${remoteName}`);
+		await repository.push('origin', localName, true);
+
+		return [octokit, ghRepository];
+	});
+
+	// yield
+	(async () => {
+		const openInGitHub = localize('openingithub', "Open In GitHub");
+		const createPR = localize('createpr', "Create PR");
+		const action = await window.showInformationMessage(localize('done', "The fork '{0}' was successfully created on GitHub.", ghRepository.full_name), openInGitHub, createPR);
+
+		if (action === openInGitHub) {
+			await commands.executeCommand('vscode.open', Uri.parse(ghRepository.html_url));
+		} else if (action === createPR) {
+			const pr = await window.withProgress({ location: ProgressLocation.Notification, cancellable: false, title: localize('createghpr', "Creating GitHub Pull Request...") }, async _ => {
+				let title = `Update ${remoteName}`;
+				const head = repository.state.HEAD?.name;
+
+				if (head) {
+					const commit = await repository.getCommit(head);
+					title = commit.message.replace(/\n.*$/m, '');
+				}
+
+				const res = await octokit.pulls.create({
+					owner,
+					repo,
+					title,
+					head: `${ghRepository.owner.login}:${remoteName}`,
+					base: remoteName
+				});
+
+				await repository.setConfig(`branch.${localName}.remote`, 'upstream');
+				await repository.setConfig(`branch.${localName}.merge`, `refs/heads/${remoteName}`);
+				await repository.setConfig(`branch.${localName}.github-pr-owner-number`, `${owner}#${repo}#${pr.number}`);
+
+				return res.data;
+			});
+
+			const openPR = localize('openpr', "Open PR");
+			const action = await window.showInformationMessage(localize('donepr', "The PR '{0}/{1}#{2}' was successfully created on GitHub.", owner, repo, pr.number), openPR);
+
+			if (action === openPR) {
+				await commands.executeCommand('vscode.open', Uri.parse(pr.html_url));
+			}
+		}
+	})();
+}
+
+export class GithubPushErrorHandler implements PushErrorHandler {
+
+	async handlePushError(repository: Repository, remote: Remote, refspec: string, error: Error & { gitErrorCode: GitErrorCodes }): Promise<boolean> {
+		if (error.gitErrorCode !== GitErrorCodes.PermissionDenied) {
+			return false;
+		}
+
+		if (!remote.pushUrl) {
+			return false;
+		}
+
+		const match = /^https:\/\/github\.com\/([^/]+)\/([^/]+)\.git/i.exec(remote.pushUrl)
+			|| /^git@github\.com:([^/]+)\/([^/]+)\.git/i.exec(remote.pushUrl);
+
+		if (!match) {
+			return false;
+		}
+
+		if (/^:/.test(refspec)) {
+			return false;
+		}
+
+		const [, owner, repo] = match;
+		await handlePushError(repository, remote, refspec, owner, repo);
+
+		return true;
+	}
+}

extensions/github/src/typings/git.d.ts

@@ -134,6 +134,8 @@ export interface CommitOptions {
 
 export interface BranchQuery {
 	readonly remote?: boolean;
+	readonly pattern?: string;
+	readonly count?: number;
 	readonly contains?: string;
 }
 
@@ -221,6 +223,10 @@ export interface CredentialsProvider {
 	getCredentials(host: Uri): ProviderResult<Credentials>;
 }
 
+export interface PushErrorHandler {
+	handlePushError(repository: Repository, remote: Remote, refspec: string, error: Error & { gitErrorCode: GitErrorCodes }): Promise<boolean>;
+}
+
 export type APIState = 'uninitialized' | 'initialized';
 
 export interface API {
@@ -237,6 +243,7 @@ export interface API {
 
 	registerRemoteSourceProvider(provider: RemoteSourceProvider): Disposable;
 	registerCredentialsProvider(provider: CredentialsProvider): Disposable;
+	registerPushErrorHandler(handler: PushErrorHandler): Disposable;
 }
 
 export interface GitExtension {
@@ -274,6 +281,7 @@ export const enum GitErrorCodes {
 	CantOpenResource = 'CantOpenResource',
 	GitNotFound = 'GitNotFound',
 	CantCreatePipe = 'CantCreatePipe',
+	PermissionDenied = 'PermissionDenied',
 	CantAccessRemote = 'CantAccessRemote',
 	RepositoryNotFound = 'RepositoryNotFound',
 	RepositoryIsLocked = 'RepositoryIsLocked',

extensions/github/src/util.ts

@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+
+export function dispose(arg: vscode.Disposable | Iterable<vscode.Disposable>): void {
+	if (arg instanceof vscode.Disposable) {
+		arg.dispose();
+	} else {
+		for (const disposable of arg) {
+			disposable.dispose();
+		}
+	}
+}
+
+export function combinedDisposable(disposables: Iterable<vscode.Disposable>): vscode.Disposable {
+	return {
+		dispose() {
+			dispose(disposables);
+		}
+	};
+}

extensions/json/package.json

@@ -48,14 +48,14 @@
           "JSON with Comments"
         ],
         "extensions": [
-          ".hintrc",
-          ".babelrc",
           ".jsonc",
           ".eslintrc",
           ".eslintrc.json",
           ".jsfmtrc",
           ".jshintrc",
-          ".swcrc"
+          ".swcrc",
+          ".hintrc",
+          ".babelrc"
         ],
         "configuration": "./language-configuration.json"
       }

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/a7e4475626a505472c76d18e0a1b3cfcf46f9cf9",
+	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/4be9cb335581f3559166c319607dac9100103083",
 	"name": "Markdown",
 	"scopeName": "text.html.markdown",
 	"patterns": [
@@ -1963,12 +1963,12 @@
 			"name": "markup.fenced_code.block.markdown"
 		},
 		"heading": {
-			"match": "(?:^|\\G)[ ]{0,3}((#{1,6})\\s+(?=[\\S[^#]]).*?\\s*(#{1,6})?)$\\n?",
+			"match": "(?:^|\\G)[ ]{0,3}(#{1,6}\\s+(.*?)(\\s+#{1,6})?\\s*)$",
 			"captures": {
 				"1": {
 					"patterns": [
 						{
-							"match": "(#{6})\\s+(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
+							"match": "(#{6})\\s+(.*?)(?:\\s+(#+))?\\s*$",
 							"name": "heading.6.markdown",
 							"captures": {
 								"1": {
@@ -1983,7 +1983,7 @@
 							}
 						},
 						{
-							"match": "(#{5})\\s+(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
+							"match": "(#{5})\\s+(.*?)(?:\\s+(#+))?\\s*$",
 							"name": "heading.5.markdown",
 							"captures": {
 								"1": {
@@ -1998,7 +1998,7 @@
 							}
 						},
 						{
-							"match": "(#{4})\\s+(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
+							"match": "(#{4})\\s+(.*?)(?:\\s+(#+))?\\s*$",
 							"name": "heading.4.markdown",
 							"captures": {
 								"1": {
@@ -2013,7 +2013,7 @@
 							}
 						},
 						{
-							"match": "(#{3})\\s+(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
+							"match": "(#{3})\\s+(.*?)(?:\\s+(#+))?\\s*$",
 							"name": "heading.3.markdown",
 							"captures": {
 								"1": {
@@ -2028,7 +2028,7 @@
 							}
 						},
 						{
-							"match": "(#{2})\\s+(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
+							"match": "(#{2})\\s+(.*?)(?:\\s+(#+))?\\s*$",
 							"name": "heading.2.markdown",
 							"captures": {
 								"1": {
@@ -2043,7 +2043,7 @@
 							}
 						},
 						{
-							"match": "(#{1})\\s+(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
+							"match": "(#{1})\\s+(.*?)(?:\\s+(#+))?\\s*$",
 							"name": "heading.1.markdown",
 							"captures": {
 								"1": {

extensions/markdown-basics/test/colorize-results/test_md.json

@@ -33,7 +33,18 @@
 		}
 	},
 	{
-		"c": " #",
+		"c": " ",
+		"t": "text.html.markdown markup.heading.markdown heading.1.markdown",
+		"r": {
+			"dark_plus": "markup.heading: #569CD6",
+			"light_plus": "markup.heading: #800000",
+			"dark_vs": "markup.heading: #569CD6",
+			"light_vs": "markup.heading: #800000",
+			"hc_black": "markup.heading: #6796E6"
+		}
+	},
+	{
+		"c": "#",
 		"t": "text.html.markdown markup.heading.markdown heading.1.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
@@ -77,7 +88,18 @@
 		}
 	},
 	{
-		"c": " ##",
+		"c": " ",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown",
+		"r": {
+			"dark_plus": "markup.heading: #569CD6",
+			"light_plus": "markup.heading: #800000",
+			"dark_vs": "markup.heading: #569CD6",
+			"light_vs": "markup.heading: #800000",
+			"hc_black": "markup.heading: #6796E6"
+		}
+	},
+	{
+		"c": "##",
 		"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
@@ -2189,7 +2211,18 @@
 		}
 	},
 	{
-		"c": " ##",
+		"c": " ",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown",
+		"r": {
+			"dark_plus": "markup.heading: #569CD6",
+			"light_plus": "markup.heading: #800000",
+			"dark_vs": "markup.heading: #569CD6",
+			"light_vs": "markup.heading: #800000",
+			"hc_black": "markup.heading: #6796E6"
+		}
+	},
+	{
+		"c": "##",
 		"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
@@ -2343,7 +2376,18 @@
 		}
 	},
 	{
-		"c": " ##",
+		"c": " ",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown",
+		"r": {
+			"dark_plus": "markup.heading: #569CD6",
+			"light_plus": "markup.heading: #800000",
+			"dark_vs": "markup.heading: #569CD6",
+			"light_vs": "markup.heading: #800000",
+			"hc_black": "markup.heading: #6796E6"
+		}
+	},
+	{
+		"c": "##",
 		"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",

extensions/markdown-language-features/media/markdown.css

@@ -11,6 +11,21 @@ html, body {
 	word-wrap: break-word;
 }
 
+body {
+	padding-top: 1em;
+}
+
+/* Reset margin top for elements */
+h1, h2, h3, h4, h5, h6,
+p, ol, ul, pre {
+	margin-top: 0;
+}
+
+h2, h3, h4, h5, h6 {
+	font-weight: normal;
+	margin-bottom: 0.2em;
+}
+
 #code-csp-warning {
 	position: fixed;
 	top: 0;
@@ -112,6 +127,20 @@ textarea:focus {
 	outline-offset: -1px;
 }
 
+p {
+	margin-bottom: 1.5em;
+}
+
+/* don't space 2 paragraphs too far apart */
+p + p {
+	margin-top: -0.8em;
+}
+
+ul,
+ol {
+	margin-bottom: 1.5em;
+}
+
 hr {
 	border: 0;
 	height: 2px;
@@ -123,9 +152,6 @@ h1 {
 	line-height: 1.2;
 	border-bottom-width: 1px;
 	border-bottom-style: solid;
-}
-
-h1, h2, h3 {
 	font-weight: normal;
 }
 

extensions/markdown-language-features/package.json

@@ -79,7 +79,7 @@
 			"editor/title": [
 				{
 					"command": "markdown.showPreviewToSide",
-					"when": "editorLangId == markdown",
+					"when": "editorLangId == markdown && !notebookEditorFocused",
 					"alt": "markdown.showPreview",
 					"group": "navigation"
 				},
@@ -115,23 +115,23 @@
 				{
 					"command": "markdown.showPreview",
 					"when": "resourceLangId == markdown",
-					"group": "navigation"
+					"group": "1_open"
 				}
 			],
 			"commandPalette": [
 				{
 					"command": "markdown.showPreview",
-					"when": "editorLangId == markdown",
+					"when": "editorLangId == markdown && !notebookEditorFocused",
 					"group": "navigation"
 				},
 				{
 					"command": "markdown.showPreviewToSide",
-					"when": "editorLangId == markdown",
+					"when": "editorLangId == markdown && !notebookEditorFocused",
 					"group": "navigation"
 				},
 				{
 					"command": "markdown.showLockedPreviewToSide",
-					"when": "editorLangId == markdown",
+					"when": "editorLangId == markdown && !notebookEditorFocused",
 					"group": "navigation"
 				},
 				{
@@ -141,7 +141,7 @@
 				},
 				{
 					"command": "markdown.showPreviewSecuritySelector",
-					"when": "editorLangId == markdown"
+					"when": "editorLangId == markdown && !notebookEditorFocused"
 				},
 				{
 					"command": "markdown.showPreviewSecuritySelector",
@@ -153,7 +153,7 @@
 				},
 				{
 					"command": "markdown.preview.refresh",
-					"when": "editorLangId == markdown"
+					"when": "editorLangId == markdown && !notebookEditorFocused"
 				},
 				{
 					"command": "markdown.preview.refresh",
@@ -166,13 +166,13 @@
 				"command": "markdown.showPreview",
 				"key": "shift+ctrl+v",
 				"mac": "shift+cmd+v",
-				"when": "editorLangId == markdown"
+				"when": "editorLangId == markdown && !notebookEditorFocused"
 			},
 			{
 				"command": "markdown.showPreviewToSide",
 				"key": "ctrl+k v",
 				"mac": "cmd+k v",
-				"when": "editorLangId == markdown"
+				"when": "editorLangId == markdown && !notebookEditorFocused"
 			}
 		],
 		"configuration": {

extensions/markdown-language-features/src/commands/openDocumentLink.ts

@@ -13,9 +13,9 @@ import { isMarkdownFile } from '../util/file';
 
 
 export interface OpenDocumentLinkArgs {
-	readonly path: string;
+	readonly path: {};
 	readonly fragment: string;
-	readonly fromResource: any;
+	readonly fromResource: {};
 }
 
 enum OpenMarkdownLinks {
@@ -29,13 +29,22 @@ export class OpenDocumentLinkCommand implements Command {
 
 	public static createCommandUri(
 		fromResource: vscode.Uri,
-		path: string,
+		path: vscode.Uri,
 		fragment: string,
 	): vscode.Uri {
+		const toJson = (uri: vscode.Uri) => {
+			return {
+				scheme: uri.scheme,
+				authority: uri.authority,
+				path: uri.path,
+				fragment: uri.fragment,
+				query: uri.query,
+			};
+		};
 		return vscode.Uri.parse(`command:${OpenDocumentLinkCommand.id}?${encodeURIComponent(JSON.stringify(<OpenDocumentLinkArgs>{
-			path: encodeURIComponent(path),
+			path: toJson(path),
 			fragment,
-			fromResource: encodeURIComponent(fromResource.toString(true)),
+			fromResource: toJson(fromResource),
 		}))}`);
 	}
 
@@ -43,26 +52,29 @@ export class OpenDocumentLinkCommand implements Command {
 		private readonly engine: MarkdownEngine
 	) { }
 
-	public execute(args: OpenDocumentLinkArgs) {
+	public async execute(args: OpenDocumentLinkArgs) {
-		const fromResource = vscode.Uri.parse(decodeURIComponent(args.fromResource));
+		return OpenDocumentLinkCommand.execute(this.engine, args);
-		const targetPath = decodeURIComponent(args.path);
-		const column = this.getViewColumn(fromResource);
-		return this.tryOpen(targetPath, args, column).catch(() => {
-			if (targetPath && extname(targetPath) === '') {
-				return this.tryOpen(targetPath + '.md', args, column);
-			}
-			const targetResource = vscode.Uri.file(targetPath);
-			return Promise.resolve(undefined)
-				.then(() => vscode.commands.executeCommand('vscode.open', targetResource, column))
-				.then(() => undefined);
-		});
 	}
 
-	private async tryOpen(path: string, args: OpenDocumentLinkArgs, column: vscode.ViewColumn) {
+	public static async execute(engine: MarkdownEngine, args: OpenDocumentLinkArgs) {
-		const resource = vscode.Uri.file(path);
+		const fromResource = vscode.Uri.parse('').with(args.fromResource);
+		const targetResource = vscode.Uri.parse('').with(args.path);
+		const column = this.getViewColumn(fromResource);
+		try {
+			return await this.tryOpen(engine, targetResource, args, column);
+		} catch {
+			if (extname(targetResource.path) === '') {
+				return this.tryOpen(engine, targetResource.with({ path: targetResource.path + '.md' }), args, column);
+			}
+			await vscode.commands.executeCommand('vscode.open', targetResource, column);
+			return undefined;
+		}
+	}
+
+	private static async tryOpen(engine: MarkdownEngine, resource: vscode.Uri, args: OpenDocumentLinkArgs, column: vscode.ViewColumn) {
 		if (vscode.window.activeTextEditor && isMarkdownFile(vscode.window.activeTextEditor.document)) {
-			if (!path || vscode.window.activeTextEditor.document.uri.fsPath === resource.fsPath) {
+			if (vscode.window.activeTextEditor.document.uri.fsPath === resource.fsPath) {
-				return this.tryRevealLine(vscode.window.activeTextEditor, args.fragment);
+				return this.tryRevealLine(engine, vscode.window.activeTextEditor, args.fragment);
 			}
 		}
 
@@ -73,10 +85,10 @@ export class OpenDocumentLinkCommand implements Command {
 
 		return vscode.workspace.openTextDocument(resource)
 			.then(document => vscode.window.showTextDocument(document, column))
-			.then(editor => this.tryRevealLine(editor, args.fragment));
+			.then(editor => this.tryRevealLine(engine, editor, args.fragment));
 	}
 
-	private getViewColumn(resource: vscode.Uri): vscode.ViewColumn {
+	private static getViewColumn(resource: vscode.Uri): vscode.ViewColumn {
 		const config = vscode.workspace.getConfiguration('markdown', resource);
 		const openLinks = config.get<OpenMarkdownLinks>('links.openLocation', OpenMarkdownLinks.currentGroup);
 		switch (openLinks) {
@@ -88,18 +100,22 @@ export class OpenDocumentLinkCommand implements Command {
 		}
 	}
 
-	private async tryRevealLine(editor: vscode.TextEditor, fragment?: string) {
+	private static async tryRevealLine(engine: MarkdownEngine, editor: vscode.TextEditor, fragment?: string) {
 		if (editor && fragment) {
-			const toc = new TableOfContentsProvider(this.engine, editor.document);
+			const toc = new TableOfContentsProvider(engine, editor.document);
 			const entry = await toc.lookup(fragment);
 			if (entry) {
-				return editor.revealRange(new vscode.Range(entry.line, 0, entry.line, 0), vscode.TextEditorRevealType.AtTop);
+				const lineStart = new vscode.Range(entry.line, 0, entry.line, 0);
+				editor.selection = new vscode.Selection(lineStart.start, lineStart.end);
+				return editor.revealRange(lineStart, vscode.TextEditorRevealType.AtTop);
 			}
 			const lineNumberFragment = fragment.match(/^L(\d+)$/i);
 			if (lineNumberFragment) {
 				const line = +lineNumberFragment[1] - 1;
 				if (!isNaN(line)) {
-					return editor.revealRange(new vscode.Range(line, 0, line, 0), vscode.TextEditorRevealType.AtTop);
+					const lineStart = new vscode.Range(line, 0, line, 0);
+					editor.selection = new vscode.Selection(lineStart.start, lineStart.end);
+					return editor.revealRange(lineStart, vscode.TextEditorRevealType.AtTop);
 				}
 			}
 		}

extensions/markdown-language-features/src/extension.ts

@@ -15,9 +15,9 @@ import MarkdownWorkspaceSymbolProvider from './features/workspaceSymbolProvider'
 import { Logger } from './logger';
 import { MarkdownEngine } from './markdownEngine';
 import { getMarkdownExtensionContributions } from './markdownExtensions';
-import { ExtensionContentSecurityPolicyArbiter, PreviewSecuritySelector, ContentSecurityPolicyArbiter } from './security';
+import { ContentSecurityPolicyArbiter, ExtensionContentSecurityPolicyArbiter, PreviewSecuritySelector } from './security';
-import { loadDefaultTelemetryReporter, TelemetryReporter } from './telemetryReporter';
 import { githubSlugifier } from './slugify';
+import { loadDefaultTelemetryReporter, TelemetryReporter } from './telemetryReporter';
 
 
 export function activate(context: vscode.ExtensionContext) {
@@ -33,7 +33,7 @@ export function activate(context: vscode.ExtensionContext) {
 
 	const contentProvider = new MarkdownContentProvider(engine, context, cspArbiter, contributions, logger);
 	const symbolProvider = new MDDocumentSymbolProvider(engine);
-	const previewManager = new MarkdownPreviewManager(contentProvider, logger, contributions);
+	const previewManager = new MarkdownPreviewManager(contentProvider, logger, contributions, engine);
 	context.subscriptions.push(previewManager);
 
 	context.subscriptions.push(registerMarkdownLanguageFeatures(symbolProvider, engine));

extensions/markdown-language-features/src/features/documentLinkProvider.ts

@@ -14,8 +14,7 @@ const localize = nls.loadMessageBundle();
 function parseLink(
 	document: vscode.TextDocument,
 	link: string,
-	base: string
+): { uri: vscode.Uri, tooltip?: string } | undefined {
-): { uri: vscode.Uri, tooltip?: string } {
 	const externalSchemeUri = getUriForLinkWithKnownExternalScheme(link);
 	if (externalSchemeUri) {
 		// Normalize VS Code links to target currently running version
@@ -29,24 +28,43 @@ function parseLink(
 	// Use a fake scheme to avoid parse warnings
 	const tempUri = vscode.Uri.parse(`vscode-resource:${link}`);
 
-	let resourcePath = tempUri.path;
+	let resourceUri: vscode.Uri | undefined;
-	if (!tempUri.path && document.uri.scheme === 'file') {
+	if (!tempUri.path) {
-		resourcePath = document.uri.path;
+		resourceUri = document.uri;
 	} else if (tempUri.path[0] === '/') {
-		const root = vscode.workspace.getWorkspaceFolder(document.uri);
+		const root = getWorkspaceFolder(document);
 		if (root) {
-			resourcePath = path.join(root.uri.fsPath, tempUri.path);
+			resourceUri = vscode.Uri.joinPath(root, tempUri.path);
 		}
 	} else {
-		resourcePath = base ? path.join(base, tempUri.path) : tempUri.path;
+		if (document.uri.scheme === Schemes.untitled) {
+			const root = getWorkspaceFolder(document);
+			if (root) {
+				resourceUri = vscode.Uri.joinPath(root, tempUri.path);
+			}
+		} else {
+			const base = document.uri.with({ path: path.dirname(document.uri.fsPath) });
+			resourceUri = vscode.Uri.joinPath(base, tempUri.path);
+		}
 	}
 
+	if (!resourceUri) {
+		return undefined;
+	}
+
+	resourceUri = resourceUri.with({ fragment: tempUri.fragment });
+
 	return {
-		uri: OpenDocumentLinkCommand.createCommandUri(document.uri, resourcePath, tempUri.fragment),
+		uri: OpenDocumentLinkCommand.createCommandUri(document.uri, resourceUri, tempUri.fragment),
 		tooltip: localize('documentLink.tooltip', 'Follow link')
 	};
 }
 
+function getWorkspaceFolder(document: vscode.TextDocument) {
+	return vscode.workspace.getWorkspaceFolder(document.uri)?.uri
+		|| vscode.workspace.workspaceFolders?.[0]?.uri;
+}
+
 function matchAll(
 	pattern: RegExp,
 	text: string
@@ -62,7 +80,6 @@ function matchAll(
 
 function extractDocumentLink(
 	document: vscode.TextDocument,
-	base: string,
 	pre: number,
 	link: string,
 	matchIndex: number | undefined
@@ -71,11 +88,14 @@ function extractDocumentLink(
 	const linkStart = document.positionAt(offset);
 	const linkEnd = document.positionAt(offset + link.length);
 	try {
-		const { uri, tooltip } = parseLink(document, link, base);
+		const linkData = parseLink(document, link);
+		if (!linkData) {
+			return undefined;
+		}
 		const documentLink = new vscode.DocumentLink(
 			new vscode.Range(linkStart, linkEnd),
-			uri);
+			linkData.uri);
-		documentLink.tooltip = tooltip;
+		documentLink.tooltip = linkData.tooltip;
 		return documentLink;
 	} catch (e) {
 		return undefined;
@@ -91,27 +111,25 @@ export default class LinkProvider implements vscode.DocumentLinkProvider {
 		document: vscode.TextDocument,
 		_token: vscode.CancellationToken
 	): vscode.DocumentLink[] {
-		const base = document.uri.scheme === 'file' ? path.dirname(document.uri.fsPath) : '';
 		const text = document.getText();
 
 		return [
-			...this.providerInlineLinks(text, document, base),
+			...this.providerInlineLinks(text, document),
-			...this.provideReferenceLinks(text, document, base)
+			...this.provideReferenceLinks(text, document)
 		];
 	}
 
 	private providerInlineLinks(
 		text: string,
 		document: vscode.TextDocument,
-		base: string
 	): vscode.DocumentLink[] {
 		const results: vscode.DocumentLink[] = [];
 		for (const match of matchAll(this.linkPattern, text)) {
-			const matchImage = match[4] && extractDocumentLink(document, base, match[3].length + 1, match[4], match.index);
+			const matchImage = match[4] && extractDocumentLink(document, match[3].length + 1, match[4], match.index);
 			if (matchImage) {
 				results.push(matchImage);
 			}
-			const matchLink = extractDocumentLink(document, base, match[1].length, match[5], match.index);
+			const matchLink = extractDocumentLink(document, match[1].length, match[5], match.index);
 			if (matchLink) {
 				results.push(matchLink);
 			}
@@ -122,7 +140,6 @@ export default class LinkProvider implements vscode.DocumentLinkProvider {
 	private provideReferenceLinks(
 		text: string,
 		document: vscode.TextDocument,
-		base: string
 	): vscode.DocumentLink[] {
 		const results: vscode.DocumentLink[] = [];
 
@@ -159,8 +176,10 @@ export default class LinkProvider implements vscode.DocumentLinkProvider {
 
 		for (const definition of definitions.values()) {
 			try {
-				const { uri } = parseLink(document, definition.link, base);
+				const linkData = parseLink(document, definition.link);
-				results.push(new vscode.DocumentLink(definition.linkRange, uri));
+				if (linkData) {
+					results.push(new vscode.DocumentLink(definition.linkRange, linkData.uri));
+				}
 			} catch (e) {
 				// noop
 			}

extensions/markdown-language-features/src/features/preview.ts

@@ -3,20 +3,20 @@
  *  Licensed under the Source EULA. 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 { Logger } from '../logger';
-import { MarkdownContentProvider } from './previewContentProvider';
-import { Disposable } from '../util/dispose';
-
 import * as nls from 'vscode-nls';
+import { OpenDocumentLinkCommand, resolveLinkToMarkdownFile } from '../commands/openDocumentLink';
+import { Logger } from '../logger';
+import { MarkdownContributionProvider } from '../markdownExtensions';
+import { Disposable } from '../util/dispose';
+import { isMarkdownFile } from '../util/file';
+import { normalizeResource, WebviewResourceProvider } from '../util/resources';
 import { getVisibleLine, TopmostLineMonitor } from '../util/topmostLineMonitor';
 import { MarkdownPreviewConfigurationManager } from './previewConfig';
-import { MarkdownContributionProvider } from '../markdownExtensions';
+import { MarkdownContentProvider } from './previewContentProvider';
-import { isMarkdownFile } from '../util/file';
+import { MarkdownEngine } from '../markdownEngine';
-import { resolveLinkToMarkdownFile } from '../commands/openDocumentLink';
+
-import { WebviewResourceProvider, normalizeResource } from '../util/resources';
 const localize = nls.loadMessageBundle();
 
 interface WebviewMessage {
@@ -123,6 +123,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 		resource: vscode.Uri,
 		startingScroll: StartingScrollLocation | undefined,
 		private readonly delegate: MarkdownPreviewDelegate,
+		private readonly engine: MarkdownEngine,
 		private readonly _contentProvider: MarkdownContentProvider,
 		private readonly _previewConfigurations: MarkdownPreviewConfigurationManager,
 		private readonly _logger: Logger,
@@ -407,7 +408,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 			}
 		}
 
-		vscode.commands.executeCommand('_markdown.openDocumentLink', { path: hrefPath, fragment, fromResource: this.resource });
+		OpenDocumentLinkCommand.execute(this.engine, { path: hrefPath, fragment, fromResource: this.resource.toJSON() });
 	}
 
 	//#region WebviewResourceProvider
@@ -452,8 +453,9 @@ export class StaticMarkdownPreview extends Disposable implements ManagedMarkdown
 		previewConfigurations: MarkdownPreviewConfigurationManager,
 		logger: Logger,
 		contributionProvider: MarkdownContributionProvider,
+		engine: MarkdownEngine,
 	): StaticMarkdownPreview {
-		return new StaticMarkdownPreview(webview, resource, contentProvider, previewConfigurations, logger, contributionProvider);
+		return new StaticMarkdownPreview(webview, resource, contentProvider, previewConfigurations, logger, contributionProvider, engine);
 	}
 
 	private readonly preview: MarkdownPreview;
@@ -465,13 +467,14 @@ export class StaticMarkdownPreview extends Disposable implements ManagedMarkdown
 		private readonly _previewConfigurations: MarkdownPreviewConfigurationManager,
 		logger: Logger,
 		contributionProvider: MarkdownContributionProvider,
+		engine: MarkdownEngine,
 	) {
 		super();
 
 		this.preview = this._register(new MarkdownPreview(this._webviewPanel, resource, undefined, {
 			getAdditionalState: () => { return {}; },
 			openPreviewLinkToMarkdownFile: () => { /* todo */ }
-		}, contentProvider, _previewConfigurations, logger, contributionProvider));
+		}, engine, contentProvider, _previewConfigurations, logger, contributionProvider));
 
 		this._register(this._webviewPanel.onDidDispose(() => {
 			this.dispose();
@@ -548,9 +551,10 @@ export class DynamicMarkdownPreview extends Disposable implements ManagedMarkdow
 		logger: Logger,
 		topmostLineMonitor: TopmostLineMonitor,
 		contributionProvider: MarkdownContributionProvider,
+		engine: MarkdownEngine,
 	): DynamicMarkdownPreview {
 		return new DynamicMarkdownPreview(webview, input,
-			contentProvider, previewConfigurations, logger, topmostLineMonitor, contributionProvider);
+			contentProvider, previewConfigurations, logger, topmostLineMonitor, contributionProvider, engine);
 	}
 
 	public static create(
@@ -560,7 +564,8 @@ export class DynamicMarkdownPreview extends Disposable implements ManagedMarkdow
 		previewConfigurations: MarkdownPreviewConfigurationManager,
 		logger: Logger,
 		topmostLineMonitor: TopmostLineMonitor,
-		contributionProvider: MarkdownContributionProvider
+		contributionProvider: MarkdownContributionProvider,
+		engine: MarkdownEngine,
 	): DynamicMarkdownPreview {
 		const webview = vscode.window.createWebviewPanel(
 			DynamicMarkdownPreview.viewType,
@@ -568,7 +573,7 @@ export class DynamicMarkdownPreview extends Disposable implements ManagedMarkdow
 			previewColumn, { enableFindWidget: true, });
 
 		return new DynamicMarkdownPreview(webview, input,
-			contentProvider, previewConfigurations, logger, topmostLineMonitor, contributionProvider);
+			contentProvider, previewConfigurations, logger, topmostLineMonitor, contributionProvider, engine);
 	}
 
 	private constructor(
@@ -579,6 +584,7 @@ export class DynamicMarkdownPreview extends Disposable implements ManagedMarkdow
 		private readonly _logger: Logger,
 		private readonly _topmostLineMonitor: TopmostLineMonitor,
 		private readonly _contributionProvider: MarkdownContributionProvider,
+		private readonly _engine: MarkdownEngine,
 	) {
 		super();
 
@@ -612,7 +618,12 @@ export class DynamicMarkdownPreview extends Disposable implements ManagedMarkdow
 		}));
 
 		this._register(vscode.window.onDidChangeActiveTextEditor(editor => {
-			if (editor && isMarkdownFile(editor.document) && !this._locked && !this._preview.isPreviewOf(editor.document.uri)) {
+			// Only allow previewing normal text editors which have a viewColumn: See #101514
+			if (typeof editor?.viewColumn === 'undefined') {
+				return;
+			}
+
+			if (isMarkdownFile(editor.document) && !this._locked && !this._preview.isPreviewOf(editor.document.uri)) {
 				const line = getVisibleLine(editor);
 				this.update(editor.document.uri, line ? new StartingScrollLine(line) : undefined);
 			}
@@ -724,6 +735,7 @@ export class DynamicMarkdownPreview extends Disposable implements ManagedMarkdow
 				this.update(link, fragment ? new StartingScrollFragment(fragment) : undefined);
 			}
 		},
+			this._engine,
 			this._contentProvider,
 			this._previewConfigurations,
 			this._logger,

extensions/markdown-language-features/src/features/previewManager.ts

@@ -5,10 +5,11 @@
 
 import * as vscode from 'vscode';
 import { Logger } from '../logger';
+import { MarkdownEngine } from '../markdownEngine';
 import { MarkdownContributionProvider } from '../markdownExtensions';
-import { disposeAll, Disposable } from '../util/dispose';
+import { Disposable, disposeAll } from '../util/dispose';
 import { TopmostLineMonitor } from '../util/topmostLineMonitor';
-import { DynamicMarkdownPreview, StaticMarkdownPreview, ManagedMarkdownPreview } from './preview';
+import { DynamicMarkdownPreview, ManagedMarkdownPreview, StaticMarkdownPreview } from './preview';
 import { MarkdownPreviewConfigurationManager } from './previewConfig';
 import { MarkdownContentProvider } from './previewContentProvider';
 
@@ -68,7 +69,8 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 	public constructor(
 		private readonly _contentProvider: MarkdownContentProvider,
 		private readonly _logger: Logger,
-		private readonly _contributions: MarkdownContributionProvider
+		private readonly _contributions: MarkdownContributionProvider,
+		private readonly _engine: MarkdownEngine,
 	) {
 		super();
 		this._register(vscode.window.registerWebviewPanelSerializer(DynamicMarkdownPreview.viewType, this));
@@ -145,7 +147,8 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 			this._previewConfigurations,
 			this._logger,
 			this._topmostLineMonitor,
-			this._contributions);
+			this._contributions,
+			this._engine);
 
 		this.registerDynamicPreview(preview);
 	}
@@ -160,7 +163,8 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 			this._contentProvider,
 			this._previewConfigurations,
 			this._logger,
-			this._contributions);
+			this._contributions,
+			this._engine);
 		this.registerStaticPreview(preview);
 	}
 
@@ -179,7 +183,8 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 			this._previewConfigurations,
 			this._logger,
 			this._topmostLineMonitor,
-			this._contributions);
+			this._contributions,
+			this._engine);
 
 		this.setPreviewActiveContext(true);
 		this._activePreview = preview;

extensions/markdown-language-features/src/markdownExtensions.ts

@@ -70,7 +70,7 @@ export namespace MarkdownContributions {
 
 		const previewStyles = getContributedStyles(contributions, extension);
 		const previewScripts = getContributedScripts(contributions, extension);
-		const previewResourceRoots = previewStyles.length || previewScripts.length ? [vscode.Uri.file(extension.extensionPath)] : [];
+		const previewResourceRoots = previewStyles.length || previewScripts.length ? [extension.extensionUri] : [];
 		const markdownItPlugins = getContributedMarkdownItPlugins(contributions, extension);
 
 		return {

extensions/markdown-language-features/src/test/documentLink.test.ts

@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import 'mocha';
+import * as vscode from 'vscode';
+import { joinLines } from './util';
+
+const testFileA = workspaceFile('a.md');
+
+function workspaceFile(...segments: string[]) {
+	return vscode.Uri.joinPath(vscode.workspace.workspaceFolders![0].uri, ...segments);
+}
+
+async function getLinksForFile(file: vscode.Uri): Promise<vscode.DocumentLink[]> {
+	return (await vscode.commands.executeCommand<vscode.DocumentLink[]>('vscode.executeLinkProvider', file))!;
+}
+
+suite('Markdown Document links', () => {
+
+	teardown(async () => {
+		await vscode.commands.executeCommand('workbench.action.closeAllEditors');
+	});
+
+	test('Should navigate to markdown file', async () => {
+		await withFileContents(testFileA, '[b](b.md)');
+
+		const [link] = await getLinksForFile(testFileA);
+		await executeLink(link);
+
+		assertActiveDocumentUri(workspaceFile('b.md'));
+	});
+
+	test('Should navigate to markdown file with leading ./', async () => {
+		await withFileContents(testFileA, '[b](./b.md)');
+
+		const [link] = await getLinksForFile(testFileA);
+		await executeLink(link);
+
+		assertActiveDocumentUri(workspaceFile('b.md'));
+	});
+
+	test('Should navigate to markdown file with leading /', async () => {
+		await withFileContents(testFileA, '[b](./b.md)');
+
+		const [link] = await getLinksForFile(testFileA);
+		await executeLink(link);
+
+		assertActiveDocumentUri(workspaceFile('b.md'));
+	});
+
+	test('Should navigate to markdown file without file extension', async () => {
+		await withFileContents(testFileA, '[b](b)');
+
+		const [link] = await getLinksForFile(testFileA);
+		await executeLink(link);
+
+		assertActiveDocumentUri(workspaceFile('b.md'));
+	});
+
+	test('Should navigate to markdown file in directory', async () => {
+		await withFileContents(testFileA, '[b](sub/c)');
+
+		const [link] = await getLinksForFile(testFileA);
+		await executeLink(link);
+
+		assertActiveDocumentUri(workspaceFile('sub', 'c.md'));
+	});
+
+	test('Should navigate to fragment by title in file', async () => {
+		await withFileContents(testFileA, '[b](sub/c#second)');
+
+		const [link] = await getLinksForFile(testFileA);
+		await executeLink(link);
+
+		assertActiveDocumentUri(workspaceFile('sub', 'c.md'));
+		assert.strictEqual(vscode.window.activeTextEditor!.selection.start.line, 1);
+	});
+
+	test('Should navigate to fragment by line', async () => {
+		await withFileContents(testFileA, '[b](sub/c#L2)');
+
+		const [link] = await getLinksForFile(testFileA);
+		await executeLink(link);
+
+		assertActiveDocumentUri(workspaceFile('sub', 'c.md'));
+		assert.strictEqual(vscode.window.activeTextEditor!.selection.start.line, 1);
+	});
+
+	test('Should navigate to fragment within current file', async () => {
+		await withFileContents(testFileA, joinLines(
+			'[](a#header)',
+			'[](#header)',
+			'# Header'));
+
+		const links = await getLinksForFile(testFileA);
+		{
+			await executeLink(links[0]);
+			assertActiveDocumentUri(workspaceFile('a.md'));
+			assert.strictEqual(vscode.window.activeTextEditor!.selection.start.line, 2);
+		}
+		{
+			await executeLink(links[1]);
+			assertActiveDocumentUri(workspaceFile('a.md'));
+			assert.strictEqual(vscode.window.activeTextEditor!.selection.start.line, 2);
+		}
+	});
+
+	test('Should navigate to fragment within current untitled file', async () => {
+		const testFile = workspaceFile('x.md').with({ scheme: 'untitled' });
+		await withFileContents(testFile, joinLines(
+			'[](#second)',
+			'# Second'));
+
+		const [link] = await getLinksForFile(testFile);
+		await executeLink(link);
+
+		assertActiveDocumentUri(testFile);
+		assert.strictEqual(vscode.window.activeTextEditor!.selection.start.line, 1);
+	});
+});
+
+
+function assertActiveDocumentUri(expectedUri: vscode.Uri) {
+	assert.strictEqual(
+		vscode.window.activeTextEditor!.document.uri.fsPath,
+		expectedUri.fsPath
+	);
+}
+
+async function withFileContents(file: vscode.Uri, contents: string): Promise<void> {
+	const document = await vscode.workspace.openTextDocument(file);
+	const editor = await vscode.window.showTextDocument(document);
+	await editor.edit(edit => {
+		edit.replace(new vscode.Range(0, 0, 1000, 0), contents);
+	});
+}
+
+async function executeLink(link: vscode.DocumentLink) {
+	const args = JSON.parse(decodeURIComponent(link.target!.query));
+	await vscode.commands.executeCommand(link.target!.path, args);
+}
+

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.file('test.md');
+const testFile = vscode.Uri.joinPath(vscode.workspace.workspaceFolders![0].uri, 'x.md');
 
 const noopToken = new class implements vscode.CancellationToken {
 	private _onCancellationRequestedEmitter = new vscode.EventEmitter<void>();
@@ -20,7 +20,7 @@ const noopToken = new class implements vscode.CancellationToken {
 };
 
 function getLinksForFile(fileContents: string) {
-	const doc = new InMemoryDocument(testFileName, fileContents);
+	const doc = new InMemoryDocument(testFile, fileContents);
 	const provider = new LinkProvider();
 	return provider.provideDocumentLinks(doc, noopToken);
 }
@@ -118,24 +118,24 @@ suite('markdown.DocumentLinkProvider', () => {
 			const links = getLinksForFile('[![alt text](image.jpg)](https://example.com)');
 			assert.strictEqual(links.length, 2);
 			const [link1, link2] = links;
-			assertRangeEqual(link1.range, new vscode.Range(0,13,0,22));
+			assertRangeEqual(link1.range, new vscode.Range(0, 13, 0, 22));
-			assertRangeEqual(link2.range, new vscode.Range(0,25,0,44));
+			assertRangeEqual(link2.range, new vscode.Range(0, 25, 0, 44));
 		}
 		{
 			const links = getLinksForFile('[![a]( whitespace.jpg )]( https://whitespace.com )');
 			assert.strictEqual(links.length, 2);
 			const [link1, link2] = links;
-			assertRangeEqual(link1.range, new vscode.Range(0,7,0,21));
+			assertRangeEqual(link1.range, new vscode.Range(0, 7, 0, 21));
-			assertRangeEqual(link2.range, new vscode.Range(0,26,0,48));
+			assertRangeEqual(link2.range, new vscode.Range(0, 26, 0, 48));
 		}
 		{
 			const links = getLinksForFile('[![a](img1.jpg)](file1.txt) text [![a](img2.jpg)](file2.txt)');
 			assert.strictEqual(links.length, 4);
 			const [link1, link2, link3, link4] = links;
-			assertRangeEqual(link1.range, new vscode.Range(0,6,0,14));
+			assertRangeEqual(link1.range, new vscode.Range(0, 6, 0, 14));
-			assertRangeEqual(link2.range, new vscode.Range(0,17,0,26));
+			assertRangeEqual(link2.range, new vscode.Range(0, 17, 0, 26));
-			assertRangeEqual(link3.range, new vscode.Range(0,39,0,47));
+			assertRangeEqual(link3.range, new vscode.Range(0, 39, 0, 47));
-			assertRangeEqual(link4.range, new vscode.Range(0,50,0,59));
+			assertRangeEqual(link4.range, new vscode.Range(0, 50, 0, 59));
 		}
 	});
 });

extensions/markdown-language-features/src/test/test-fixtures/marker.txt

@@ -1 +0,0 @@
-DO NOT DELETE, USED BY INTEGRATION TESTS

extensions/markdown-language-features/src/test/util.ts

@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as os from 'os';
+
+export const joinLines = (...args: string[]) =>
+	args.join(os.platform() === 'win32' ? '\r\n' : '\n');

extensions/markdown-language-features/src/util/links.ts

@@ -9,6 +9,7 @@ export const Schemes = {
 	http: 'http:',
 	https: 'https:',
 	file: 'file:',
+	untitled: 'untitled',
 	mailto: 'mailto:',
 	data: 'data:',
 	vscode: 'vscode:',

extensions/markdown-language-features/test-workspace/a.md

@@ -0,0 +1,4 @@
+[b](b)
+[b](b.md)
+[b](./b.md)
+[b](/b.md)

extensions/markdown-language-features/test-workspace/b.md

@@ -0,0 +1,3 @@
+# b
+
+[](./a)

extensions/markdown-language-features/test-workspace/sub/c.md

@@ -0,0 +1,6 @@
+# First
+# Second
+
+[b](/b.md)
+[b](../b.md)
+[b](./../b.md)

extensions/microsoft-authentication/src/AADHelper.ts

@@ -26,7 +26,7 @@ interface IToken {
 	refreshToken: string;
 
 	account: {
-		displayName: string;
+		label: string;
 		id: string;
 	};
 	scope: string;
@@ -48,7 +48,8 @@ interface IStoredSession {
 	refreshToken: string;
 	scope: string; // Scopes are alphabetized and joined with a space
 	account: {
-		displayName: string,
+		label?: string;
+		displayName?: string,
 		id: string
 	}
 }
@@ -101,7 +102,7 @@ export class AzureActiveDirectoryService {
 									accessToken: undefined,
 									refreshToken: session.refreshToken,
 									account: {
-										displayName: session.account.displayName,
+										label: session.account.label ?? session.account.displayName!,
 										id: session.account.id
 									},
 									scope: session.scope,
@@ -437,7 +438,7 @@ export class AzureActiveDirectoryService {
 			scope,
 			sessionId: existingId || `${claims.tid}/${(claims.oid || (claims.altsecid || '' + claims.ipd || ''))}/${uuid()}`,
 			account: {
-				displayName: claims.email || claims.unique_name || 'user@example.com',
+				label: claims.email || claims.unique_name || 'user@example.com',
 				id: `${claims.tid}/${(claims.oid || (claims.altsecid || '' + claims.ipd || ''))}`
 			}
 		};

extensions/microsoft-authentication/src/extension.ts

@@ -19,27 +19,42 @@ export async function activate(context: vscode.ExtensionContext) {
 
 	context.subscriptions.push(vscode.authentication.registerAuthenticationProvider({
 		id: 'microsoft',
-		displayName: 'Microsoft',
+		label: 'Microsoft',
 		supportsMultipleAccounts: true,
 		onDidChangeSessions: onDidChangeSessions.event,
 		getSessions: () => Promise.resolve(loginService.sessions),
 		login: async (scopes: string[]) => {
 			try {
+				/* __GDPR__
+					"login" : { }
+				*/
 				telemetryReporter.sendTelemetryEvent('login');
+
 				const session = await loginService.login(scopes.sort().join(' '));
 				onDidChangeSessions.fire({ added: [session.id], removed: [], changed: [] });
 				return session;
 			} catch (e) {
+				/* __GDPR__
+					"loginFailed" : { }
+				*/
 				telemetryReporter.sendTelemetryEvent('loginFailed');
+
 				throw e;
 			}
 		},
 		logout: async (id: string) => {
 			try {
+				/* __GDPR__
+					"logout" : { }
+				*/
 				telemetryReporter.sendTelemetryEvent('logout');
+
 				await loginService.logout(id);
 				onDidChangeSessions.fire({ added: [], removed: [id], changed: [] });
 			} catch (e) {
+				/* __GDPR__
+					"logoutFailed" : { }
+				*/
 				telemetryReporter.sendTelemetryEvent('logoutFailed');
 			}
 		}

extensions/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "3.9.5"
+    "typescript": "3.9.6"
   },
   "scripts": {
     "postinstall": "node ./postinstall"

extensions/theme-defaults/themes/hc_black.json

@@ -122,5 +122,11 @@
 				"foreground": "#CBEDCB",
 			}
 		}
-	]
+	],
+	"semanticTokenColors": {
+		"newOperator": "#FFFFFF",
+		"stringLiteral": "#ce9178",
+		"customLiteral": "#DCDCAA",
+		"numberLiteral": "#b5cea8",
+	}
 }

extensions/theme-defaults/themes/light_defaults.json

@@ -20,10 +20,9 @@
 		"statusBarItem.remoteBackground": "#16825D",
 		"sideBarSectionHeader.background": "#0000",
 		"sideBarSectionHeader.border": "#61616130",
-		"notebook.cellFocusBackground": "#c8ddf150",
+		"notebook.focusedCellBackground": "#c8ddf150",
 		"notebook.cellBorderColor": "#dae3e9",
-		"notebook.outputContainerBackgroundColor": "#c8ddf150",
+		"notebook.outputContainerBackgroundColor": "#c8ddf150"
-		"notebook.focusedCellShadow": "#00315040"
 	},
 	"semanticHighlighting": true
 }

extensions/vscode-web-playground/src/exampleFiles.ts

@@ -282,7 +282,7 @@ Or discuss debug adapters on Gitter:
 
 You can now 'step through' the 'readme.md' file, set and hit breakpoints, and run into exceptions (if the word exception appears in a line).
 
-![Mock Debug](images/mock-debug.gif)
+![Mock Debug](file.jpg)
 
 ## Build and Run
 
@@ -302,3 +302,9 @@ export function getImageFile(): Uint8Array {
 	const data = atob(`/9j/4AAQSkZJRgABAQAASABIAAD/2wCEAA4ODg4ODhcODhchFxcXIS0hISEhLTktLS0tLTlFOTk5OTk5RUVFRUVFRUVSUlJSUlJgYGBgYGxsbGxsbGxsbGwBERISGxkbLxkZL3FMP0xxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcf/AABEIAFYAZAMBIgACEQEDEQH/xAB1AAACAwEBAQAAAAAAAAAAAAAABAMFBgIBBxAAAgIBAwMCBQQCAwAAAAAAAQIAAxEEBSESMUFRcRMiIzJhFIGRoQbBQlKxAQEBAQEAAAAAAAAAAAAAAAABAgADEQEBAQADAQEAAAAAAAAAAAAAARESITECQf/aAAwDAQACEQMRAD8A2LEZkLc/bKxbdYEHWoyfEze56zXpqRTTYUyPHiVrY2TVZyMzhFZMg8iYE6jcVXAusY98KMnj2lhRu+4aLoGuTNTYPV5APnyDNyPFp6EY3EsO3kxnVVLZVg8z2tw9YsXkGQpcbGIbxHQzep0vw8Jgc8n28CJJRY30lBwzf1iaa2ku/HmMV01VW/k/6hh0abTDTafpPcTytmckEewjeosAqJEj0yDo6yO/rFLzoGME5nIAXtGSM9uwnjLn8zFECw7QneITMWouR7gj9/Ep94061bjXa32WDGfzOGuCXKy9/wDc0FlFe5aX4OpHJHBHcSfT4w246bWJar6MsCwKnp9DOF0r6XRiu5snvg9hNK217vQeih0tXwzcED895R7voNfWoN9gOT2QH/2T3mHrda3Y+p9ppZuSV/qR0j6r+5ju2oun2ypOwCAASGikISzdySf5lxLsAdRPpIqw91xC/wDHvGbAAh88RnSVCjT9b8E/MYsguerTqWuYKo8k4ESTcttsPSmoQ+zCZPWPbvWqsvLE0IxCL4wPP7xEW7TXeKsvaGABOMdLef2ky7ejevX0tBWy5Qhh6jmS9IIxPm6XazbW69K56M/aeRibnSaqyytWtGCfE0+tazDhrHpCdixT5EJSWD1BPkcjsYxpN21FWEcdu0dG3hl8rIX0YqUgDqkSrq/0+6oyfOOZT7hqxqLMKMk8ARfS0fqGatAR04yCY+u3OpLt38e0rQl0tzsFrc8rxj0lqqDHMzujIXUMGPI4mjS1MTCvG8gRLddYE2811n5nHTJ9RaAsztzZ1AZhlX9fBi0VWgWzbSqahfpWfa/iSnatMuqOpVgVPIHGMzc6erS3aQVOoZSMFTK19i2pTwGA9Axx/E58b+K2M8lP6/Urp6BkA5Y+OPE112nrIFeOw8RMajQ7dWU0iAH8TyrVG0mw8EypMFuk7K9TS5RGJHiEYsuUtmEWO1KO2RGDRSVJzj1MiQhOQIx8QEYK5hGpUUJVc1lTgcDjEe1FPxqGQHBZSMiQqa8/Z38xgOoHB/aIfJNVZrdFqirsVbsfzLXT7+UQLYmcDHBlh/k+g+KP1dOCV+4efcTNbdtGq3CxQiMKyeX7CGqxqtDuK7lYK2BXnAz3JMuNZoPpDAyV5zHNt2bRbcA1S/Pjljyf7jerWxx0V4wQeZgynxrUXoUnIif629GJY595cptr1N9XJYjOfEi1G3LYMLgH1m04qxelrAtnj/qZYIvUPpMcHwYtTT8FzVaMN6+sslqVF6gcQ1sRivPccwjS314+bGYRBnqzws6FhUfL7CQ8gdI7+TDIHHgcSVGBYRznMXfUL2J5ngPUOYCpfM2tiq1tnUpVRnMe0DGtAKyQIw+mU4GJCKmrPy+I6V0lxYYIzxOCtdjZyVIMRqtPsYx8RT37+sdRhsFlHzcyC0J0kmcfqFX5cxC7VAk4OPUQtM+UVtYf7vH8iKP8SnKg5U9xHQwsGV7jxF9QnWACMEcgwlUjT4ZUE+YRRLGRehwciEpLRMAAT6SALlIQkF4kl7HEIQLwuQfac9RPeEJi5H3TruvvmEJo1QOcgGQuvVg+sITM8rDKeDHVItXkQhKgqM6esnJEIQlJf//Z`);
 	return Uint8Array.from([...data].map(x => x.charCodeAt(0)));
 }
+
+// encoded from 'АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя'
+export const windows1251File = Uint8Array.from([192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255]);
+
+// encoded from '中国abc'
+export const gbkFile = Uint8Array.from([214, 208, 185, 250, 97, 98, 99]);

extensions/vscode-web-playground/src/memfs.ts

@@ -29,7 +29,7 @@ import {
 	Uri,
 	workspace,
 } from 'vscode';
-import { largeTSFile, getImageFile, debuggableFile } from './exampleFiles';
+import { largeTSFile, getImageFile, debuggableFile, windows1251File, gbkFile } from './exampleFiles';
 
 export class File implements FileStat {
 
@@ -123,6 +123,19 @@ export class MemFS implements FileSystemProvider, FileSearchProvider, TextSearch
 		this.writeFile(Uri.parse(`memfs:/sample-folder/xyz/UPPER.txt`), textEncoder.encode('UPPER'), { create: true, overwrite: true });
 		this.writeFile(Uri.parse(`memfs:/sample-folder/xyz/upper.txt`), textEncoder.encode('upper'), { create: true, overwrite: true });
 		this.writeFile(Uri.parse(`memfs:/sample-folder/xyz/def/foo.md`), textEncoder.encode('*MemFS*'), { create: true, overwrite: true });
+
+		// some files in different encodings
+		this.createDirectory(Uri.parse(`memfs:/sample-folder/encodings/`));
+		this.writeFile(
+			Uri.parse(`memfs:/sample-folder/encodings/windows1251.txt`),
+			windows1251File,
+			{ create: true, overwrite: true }
+		);
+		this.writeFile(
+			Uri.parse(`memfs:/sample-folder/encodings/gbk.txt`),
+			gbkFile,
+			{ create: true, overwrite: true }
+		);
 	}
 
 	root = new Directory(Uri.parse('memfs:/'), '');

extensions/xml/package.json

@@ -23,8 +23,8 @@
 				".dita",
 				".ditamap",
 				".dtd",
-        ".ent",
+        		".ent",
-        ".mod",
+        		".mod",
 				".dtml",
 				".fsproj",
 				".fxml",

extensions/yarn.lock

@@ -76,10 +76,10 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-typescript@3.9.5:
+typescript@3.9.6:
-  version "3.9.5"
+  version "3.9.6"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a"
-  integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==
+  integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw==
 
 wrappy@1:
   version "1.0.2"

package.json

@@ -14,7 +14,7 @@
     "preinstall": "node build/npm/preinstall.js",
     "postinstall": "node build/npm/postinstall.js",
     "compile": "gulp compile --max_old_space_size=4095",
-    "watch": "gulp watch --max_old_space_size=4095",
+    "watch": "concurrently \"npm:watch-client\" \"npm:watch-extensions\"",
     "watchd": "deemon yarn watch",
     "watch-webd": "deemon yarn watch-web",
     "kill-watchd": "deemon --kill yarn watch",
@@ -22,6 +22,11 @@
     "restart-watchd": "deemon --restart yarn watch",
     "restart-watch-webd": "deemon --restart yarn watch-web",
     "watch-client": "gulp watch-client --max_old_space_size=4095",
+    "watch-clientd": "deemon yarn watch-client",
+    "kill-watch-clientd": "deemon --kill yarn watch-client",
+    "watch-extensions": "gulp watch-extensions --max_old_space_size=4095",
+    "watch-extensionsd": "deemon yarn watch-extensions",
+    "kill-watch-extensionsd": "deemon --kill yarn watch-extensions",
     "mocha": "mocha test/unit/node/all.js --delay",
     "precommit": "node build/gulpfile.hygiene.js",
     "gulp": "gulp --max_old_space_size=8192",
@@ -62,9 +67,9 @@
     "html-query-plan": "git://github.com/anthonydresser/html-query-plan.git#2.6",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.3",
-    "iconv-lite-umd": "0.6.5",
+    "iconv-lite-umd": "0.6.8",
     "jquery": "3.5.0",
-    "jschardet": "2.1.1",
+    "jschardet": "2.2.1",
     "keytar": "^5.5.0",
     "minimist": "^1.2.5",
     "native-is-elevated": "0.4.1",
@@ -84,10 +89,10 @@
     "vscode-nsfw": "1.2.8",
     "vscode-oniguruma": "1.3.1",
     "vscode-proxy-agent": "^0.5.2",
-    "vscode-ripgrep": "^1.7.0",
+    "vscode-ripgrep": "^1.8.0",
     "vscode-sqlite3": "4.0.10",
     "vscode-textmate": "5.2.0",
-    "xterm": "4.7.0-beta.3",
+    "xterm": "4.8.1",
     "xterm-addon-search": "0.7.0",
     "xterm-addon-unicode11": "0.2.0",
     "xterm-addon-webgl": "0.7.0",
@@ -124,12 +129,13 @@
     "ansi-colors": "^3.2.3",
     "asar": "^0.14.0",
     "chromium-pickle-js": "^0.2.0",
+    "concurrently": "^5.2.0",
     "copy-webpack-plugin": "^4.5.2",
     "cson-parser": "^1.3.3",
     "css-loader": "^3.2.0",
     "debounce": "^1.0.0",
     "deemon": "^1.4.0",
-    "electron": "7.3.2",
+    "electron": "8.3.3",
     "eslint": "6.8.0",
     "eslint-plugin-jsdoc": "^19.1.0",
     "event-stream": "3.3.4",
@@ -157,7 +163,7 @@
     "gulp-untar": "^0.0.7",
     "gulp-vinyl-zip": "^2.1.2",
     "husky": "^0.13.1",
-    "innosetup": "5.6.1",
+    "innosetup": "6.0.5",
     "is": "^3.1.0",
     "istanbul-lib-coverage": "^3.0.0",
     "istanbul-lib-instrument": "^4.0.0",

remote/package.json

@@ -20,9 +20,9 @@
     "html-query-plan": "git://github.com/anthonydresser/html-query-plan.git#2.6",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.3",
-    "iconv-lite-umd": "0.6.5",
+    "iconv-lite-umd": "0.6.8",
     "jquery": "3.5.0",
-    "jschardet": "2.1.1",
+    "jschardet": "2.2.1",
     "minimist": "^1.2.5",
     "native-watchdog": "1.3.0",
     "ng2-charts": "^1.6.0",
@@ -36,9 +36,9 @@
     "vscode-nsfw": "1.2.8",
     "vscode-oniguruma": "1.3.1",
     "vscode-proxy-agent": "^0.5.2",
-    "vscode-ripgrep": "^1.7.0",
+    "vscode-ripgrep": "^1.8.0",
     "vscode-textmate": "5.2.0",
-    "xterm": "4.7.0-beta.3",
+    "xterm": "4.8.1",
     "xterm-addon-search": "0.7.0",
     "xterm-addon-unicode11": "0.2.0",
     "xterm-addon-webgl": "0.7.0",

remote/web/package.json

@@ -14,8 +14,8 @@
 		"ansi_up": "^3.0.0",
 		"chart.js": "^2.6.0",
 		"html-query-plan": "git://github.com/anthonydresser/html-query-plan.git#2.6",
-		"iconv-lite-umd": "0.6.5",
+		"iconv-lite-umd": "0.6.8",
-		"jschardet": "2.1.1",
+		"jschardet": "2.2.1",
 		"jquery": "3.5.0",
 		"ng2-charts": "^1.6.0",
 		"reflect-metadata": "^0.1.8",
@@ -25,7 +25,7 @@
 		"slickgrid": "github:anthonydresser/SlickGrid#2.3.33",
 		"vscode-oniguruma": "1.3.1",
 		"vscode-textmate": "5.2.0",
-		"xterm": "4.7.0-beta.3",
+		"xterm": "4.8.1",
 		"xterm-addon-search": "0.7.0",
 		"xterm-addon-unicode11": "0.2.0",
 		"xterm-addon-webgl": "0.7.0",

remote/web/yarn.lock

@@ -182,10 +182,10 @@ htmlparser2@^3.10.0:
     inherits "^2.0.1"
     readable-stream "^3.1.1"
 
-iconv-lite-umd@0.6.5:
+iconv-lite-umd@0.6.8:
-  version "0.6.5"
+  version "0.6.8"
-  resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.5.tgz#6a1f621a3b4d125f72feff813a9839e1ebd6c722"
+  resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.8.tgz#5ad310ec126b260621471a2d586f7f37b9958ec0"
-  integrity sha512-WDegH4al+e3n3jTOStRvm+jzDA3JMUQGgzdAsMxAgcgB0Oi72HjfdsoX08ieKsy3rKexXVjWZr41aOIUaCZnMg==
+  integrity sha512-zvXJ5gSwMC9JD3wDzH8CoZGc1pbiJn12Tqjk8BXYCnYz3hYL5GRjHW8LEykjXhV9WgNGI4rgpgHcbIiBfrRq6A==
 
 inherits@^2.0.1, inherits@^2.0.3:
   version "2.0.4"
@@ -197,10 +197,10 @@ jquery@3.5.0:
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
   integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
 
-jschardet@2.1.1:
+jschardet@2.2.1:
-  version "2.1.1"
+  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-2.1.1.tgz#af6f8fd0b3b0f5d46a8fd9614a4fce490575c184"
+  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-2.2.1.tgz#03b0264669a90c7a5c436a68c5a7d4e4cb0c9823"
-  integrity sha512-pA5qG9Zwm8CBpGlK/lo2GE9jPxwqRgMV7Lzc/1iaPccw6v4Rhj8Zg2BTyrdmHmxlJojnbLupLeRnaPLsq03x6Q==
+  integrity sha512-Ks2JNuUJoc7PGaZ7bVFtSEvOcr0rBq6Q1J5/7+zKWLT+g+4zziL63O0jg7y2jxhzIa1LVsHUbPXrbaWmz9iwDw==
 
 lodash.clonedeep@^4.5.0:
   version "4.5.0"
@@ -378,10 +378,10 @@ xterm-addon-webgl@0.7.0:
   resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.7.0.tgz#a13732ac937170e53ce02ec91963da042c80614b"
   integrity sha512-PMWLgccAF31GulCYkQxIA8qwMI4q4UbRi5O/zwMnSJWBozB0yy84lX31ZhJeJhcrlEn1Vpcd+OUGPE8Z1hBjnw==
 
-xterm@4.7.0-beta.3:
+xterm@4.8.1:
-  version "4.7.0-beta.3"
+  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.7.0-beta.3.tgz#d8997f190430d750201717adf3857f6c8052f149"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.8.1.tgz#155a1729a43e1a89b406524e22c5634339e39ca1"
-  integrity sha512-mL9VCB7Ql7KSql2PJmRQYba77mMXlliK9lVKd3XCDqtOYYWjg+CKKeNtFljIrPoiI25nvoqlkrv5dFuuIAR5hA==
+  integrity sha512-ax91ny4tI5eklqIfH79OUSGE2PUX2rGbwONmB6DfqpyhSZO8/cf++sqiaMWEVCMjACyMfnISW7C3gGMoNvNolQ==
 
 zone.js@^0.8.4:
   version "0.8.29"