diff --git a/extensions/html/.vscode/launch.json b/extensions/html/.vscode/launch.json index 7a654d67e8d..3b0e212f68e 100644 --- a/extensions/html/.vscode/launch.json +++ b/extensions/html/.vscode/launch.json @@ -24,6 +24,14 @@ "sourceMaps": true, "outDir": "${workspaceRoot}/client/out/test", "preLaunchTask": "npm" + }, + { + "name": "Attach Language Server", + "type": "node", + "request": "attach", + "port": 6004, + "sourceMaps": true, + "outDir": "${workspaceRoot}/server/out" } ] } \ No newline at end of file diff --git a/extensions/html/server/npm-shrinkwrap.json b/extensions/html/server/npm-shrinkwrap.json index 811b781c29d..a1f7d09a5e9 100644 --- a/extensions/html/server/npm-shrinkwrap.json +++ b/extensions/html/server/npm-shrinkwrap.json @@ -8,9 +8,9 @@ "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-2.0.0-next.3.tgz" }, "vscode-html-languageservice": { - "version": "1.0.1-next.2", + "version": "1.0.1-next.3", "from": "vscode-html-languageservice@next", - "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-1.0.1-next.2.tgz" + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-1.0.1-next.3.tgz" }, "vscode-jsonrpc": { "version": "2.4.0", diff --git a/extensions/html/server/package.json b/extensions/html/server/package.json index ccda47decda..8dbee89cebb 100644 --- a/extensions/html/server/package.json +++ b/extensions/html/server/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "vscode-css-languageservice": "^2.0.0-next.3", - "vscode-html-languageservice": "^1.0.1-next.2", + "vscode-html-languageservice": "^1.0.1-next.3", "vscode-languageserver": "^2.6.2-next.1", "vscode-nls": "^1.0.4", "vscode-uri": "^1.0.0" diff --git a/extensions/html/server/src/htmlServerMain.ts b/extensions/html/server/src/htmlServerMain.ts index c4adb4a7633..796b7b8ae78 100644 --- a/extensions/html/server/src/htmlServerMain.ts +++ b/extensions/html/server/src/htmlServerMain.ts @@ -5,7 +5,7 @@ 'use strict'; import { createConnection, IConnection, TextDocuments, InitializeParams, InitializeResult, RequestType } from 'vscode-languageserver'; -import { DocumentContext, TextDocument, Diagnostic, DocumentLink, Range } from 'vscode-html-languageservice'; +import { DocumentContext, TextDocument, Diagnostic, DocumentLink, Range, TextEdit } from 'vscode-html-languageservice'; import { getLanguageModes, LanguageModes } from './modes/languageModes'; import * as url from 'url'; @@ -112,12 +112,20 @@ function validateTextDocument(textDocument: TextDocument): void { let diagnostics: Diagnostic[] = []; languageModes.getAllModesInDocument(textDocument).forEach(mode => { if (mode.doValidation) { - diagnostics = diagnostics.concat(mode.doValidation(textDocument)); + pushAll(diagnostics, mode.doValidation(textDocument)); } }); connection.sendDiagnostics({ uri: textDocument.uri, diagnostics }); } +function pushAll(to: T[], from: T[]) { + if (from) { + for (var i = 0; i < from.length; i++) { + to.push(from[i]); + } + } +} + connection.onCompletion(textDocumentPosition => { let document = documents.get(textDocumentPosition.textDocument.uri); let mode = languageModes.getModeAtPosition(document, textDocumentPosition.position); @@ -186,12 +194,16 @@ connection.onSignatureHelp(signatureHelpParms => { connection.onDocumentRangeFormatting(formatParams => { let document = documents.get(formatParams.textDocument.uri); - let startMode = languageModes.getModeAtPosition(document, formatParams.range.start); - let endMode = languageModes.getModeAtPosition(document, formatParams.range.end); - if (startMode && startMode === endMode && startMode.format) { - return startMode.format(document, formatParams.range, formatParams.options); - } - return null; + let ranges = languageModes.getModesInRange(document, formatParams.range); + let result: TextEdit[] = []; + ranges.forEach(r => { + let mode = r.mode; + if (mode && mode.format) { + let edits = mode.format(document, r, formatParams.options); + pushAll(result, edits); + } + }); + return result; }); connection.onDocumentLinks(documentLinkParam => { @@ -207,7 +219,7 @@ connection.onDocumentLinks(documentLinkParam => { let links: DocumentLink[] = []; languageModes.getAllModesInDocument(document).forEach(m => { if (m.findDocumentLinks) { - links = links.concat(m.findDocumentLinks(document, documentContext)); + pushAll(links, m.findDocumentLinks(document, documentContext)); } }); return links; @@ -219,7 +231,7 @@ connection.onRequest(ColorSymbolRequest.type, uri => { if (document) { languageModes.getAllModesInDocument(document).forEach(m => { if (m.findColorSymbols) { - ranges = ranges.concat(m.findColorSymbols(document)); + pushAll(ranges, m.findColorSymbols(document)); } }); } diff --git a/extensions/html/server/src/modes/embeddedSupport.ts b/extensions/html/server/src/modes/embeddedSupport.ts index e982527a89e..9608696b271 100644 --- a/extensions/html/server/src/modes/embeddedSupport.ts +++ b/extensions/html/server/src/modes/embeddedSupport.ts @@ -5,7 +5,11 @@ 'use strict'; -import { TextDocument, Position, HTMLDocument, Node, LanguageService, TokenType } from 'vscode-html-languageservice'; +import { TextDocument, Position, HTMLDocument, Node, LanguageService, TokenType, Range } from 'vscode-html-languageservice'; + +export interface LanguageRange extends Range { + languageId: string; +} export function getLanguageAtPosition(languageService: LanguageService, document: TextDocument, htmlDocument: HTMLDocument, position: Position): string { let offset = document.offsetAt(position); @@ -33,6 +37,50 @@ export function getLanguagesInContent(languageService: LanguageService, document return Object.keys(embeddedLanguageIds); } +export function getLanguagesInRange(languageService: LanguageService, document: TextDocument, htmlDocument: HTMLDocument, range: Range): LanguageRange[] { + let ranges: LanguageRange[] = []; + let currentPos = range.start; + let currentOffset = document.offsetAt(currentPos); + let rangeEndOffset = document.offsetAt(range.end); + function collectEmbeddedNodes(node: Node): void { + if (node.start < rangeEndOffset && node.end > currentOffset) { + let c = getEmbeddedContentForNode(languageService, document, node); + if (c && c.start < rangeEndOffset) { + let startPos = document.positionAt(c.start); + if (currentOffset < c.start) { + ranges.push({ + start: currentPos, + end: startPos, + languageId: 'html' + }); + } + let end = Math.min(c.end, rangeEndOffset); + let endPos = document.positionAt(end); + if (end > c.start) { + ranges.push({ + start: startPos, + end: endPos, + languageId: c.languageId + }); + } + currentOffset = end; + currentPos = endPos; + } + } + node.children.forEach(collectEmbeddedNodes); + } + + htmlDocument.roots.forEach(collectEmbeddedNodes); + if (currentOffset < rangeEndOffset) { + ranges.push({ + start: currentPos, + end: range.end, + languageId: 'html' + }); + } + return ranges; +} + export function getEmbeddedDocument(languageService: LanguageService, document: TextDocument, htmlDocument: HTMLDocument, languageId: string): TextDocument { let contents = []; function collectEmbeddedNodes(node: Node): void { diff --git a/extensions/html/server/src/modes/javascriptMode.ts b/extensions/html/server/src/modes/javascriptMode.ts index 19edf0a0d5a..957db80b184 100644 --- a/extensions/html/server/src/modes/javascriptMode.ts +++ b/extensions/html/server/src/modes/javascriptMode.ts @@ -54,7 +54,7 @@ export function getJavascriptMode(htmlLanguageService: HTMLLanguageService, html return { configure(options: any) { - settings = options && options.html; + settings = options && options.javascript; }, doValidation(document: TextDocument): Diagnostic[] { currentTextDocument = jsDocuments.get(document); @@ -194,15 +194,22 @@ export function getJavascriptMode(htmlLanguageService: HTMLLanguageService, html }, format(document: TextDocument, range: Range, formatParams: FormattingOptions): TextEdit[] { currentTextDocument = jsDocuments.get(document); - let formatSettings = convertOptions(formatParams, settings && settings.format); + let initialIndentLevel = computeInitialIndent(document, range, formatParams) + 1; + let formatSettings = convertOptions(formatParams, settings && settings.format, initialIndentLevel); let start = currentTextDocument.offsetAt(range.start); let end = currentTextDocument.offsetAt(range.end); let edits = jsLanguageService.getFormattingEditsForRange(FILE_NAME, start, end, formatSettings); if (edits) { - return edits.map(e => ({ - range: convertRange(currentTextDocument, e.span), - newText: e.newText - })); + let result = []; + for (let edit of edits) { + if (edit.span.start >= start && edit.span.start + edit.span.length <= end) { + result.push({ + range: convertRange(currentTextDocument, edit.span), + newText: edit.newText + }); + } + } + return result; } return null; }, @@ -255,23 +262,44 @@ function convertKind(kind: string): CompletionItemKind { return CompletionItemKind.Property; } -function convertOptions(options: FormattingOptions, formatSettings?: any): ts.FormatCodeOptions { +function convertOptions(options: FormattingOptions, formatSettings: any, initialIndentLevel: number): ts.FormatCodeOptions { return { ConvertTabsToSpaces: options.insertSpaces, TabSize: options.tabSize, IndentSize: options.tabSize, IndentStyle: ts.IndentStyle.Smart, NewLineCharacter: '\n', - BaseIndentSize: 1, // - InsertSpaceAfterCommaDelimiter: !formatSettings || formatSettings.insertSpaceAfterCommaDelimiter, - InsertSpaceAfterSemicolonInForStatements: !formatSettings || formatSettings.insertSpaceAfterSemicolonInForStatements, - InsertSpaceBeforeAndAfterBinaryOperators: !formatSettings || formatSettings.insertSpaceBeforeAndAfterBinaryOperators, - InsertSpaceAfterKeywordsInControlFlowStatements: !formatSettings || formatSettings.insertSpaceAfterKeywordsInControlFlowStatements, - InsertSpaceAfterFunctionKeywordForAnonymousFunctions: !formatSettings || formatSettings.insertSpaceAfterFunctionKeywordForAnonymousFunctions, - InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: formatSettings && formatSettings.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis, - InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: formatSettings && formatSettings.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets, - InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: formatSettings && formatSettings.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces, - PlaceOpenBraceOnNewLineForControlBlocks: formatSettings && formatSettings.placeOpenBraceOnNewLineForFunctions, - PlaceOpenBraceOnNewLineForFunctions: formatSettings && formatSettings.placeOpenBraceOnNewLineForControlBlocks + BaseIndentSize: options.tabSize * initialIndentLevel, + InsertSpaceAfterCommaDelimiter: Boolean(!formatSettings || formatSettings.insertSpaceAfterCommaDelimiter), + InsertSpaceAfterSemicolonInForStatements: Boolean(!formatSettings || formatSettings.insertSpaceAfterSemicolonInForStatements), + InsertSpaceBeforeAndAfterBinaryOperators: Boolean(!formatSettings || formatSettings.insertSpaceBeforeAndAfterBinaryOperators), + InsertSpaceAfterKeywordsInControlFlowStatements: Boolean(!formatSettings || formatSettings.insertSpaceAfterKeywordsInControlFlowStatements), + InsertSpaceAfterFunctionKeywordForAnonymousFunctions: Boolean(!formatSettings || formatSettings.insertSpaceAfterFunctionKeywordForAnonymousFunctions), + InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: Boolean(formatSettings && formatSettings.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis), + InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: Boolean(formatSettings && formatSettings.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets), + InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: Boolean(formatSettings && formatSettings.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces), + PlaceOpenBraceOnNewLineForControlBlocks: Boolean(formatSettings && formatSettings.placeOpenBraceOnNewLineForFunctions), + PlaceOpenBraceOnNewLineForFunctions: Boolean(formatSettings && formatSettings.placeOpenBraceOnNewLineForControlBlocks) }; +} + +function computeInitialIndent(document: TextDocument, range: Range, options: FormattingOptions) { + let lineStart = document.offsetAt(Position.create(range.start.line, 0)); + let content = document.getText(); + + let i = lineStart; + let nChars = 0; + let tabSize = options.tabSize || 4; + while (i < content.length) { + let ch = content.charAt(i); + if (ch === ' ') { + nChars++; + } else if (ch === '\t') { + nChars += tabSize; + } else { + break; + } + i++; + } + return Math.floor(nChars / tabSize); } \ No newline at end of file diff --git a/extensions/html/server/src/modes/languageModes.ts b/extensions/html/server/src/modes/languageModes.ts index 1e52531b1e1..4e788b7bf51 100644 --- a/extensions/html/server/src/modes/languageModes.ts +++ b/extensions/html/server/src/modes/languageModes.ts @@ -11,7 +11,7 @@ import { } from 'vscode-languageserver-types'; import { getLanguageModelCache } from '../languageModelCache'; -import { getLanguageAtPosition, getLanguagesInContent } from './embeddedSupport'; +import { getLanguageAtPosition, getLanguagesInContent, getLanguagesInRange } from './embeddedSupport'; import { getCSSMode } from './cssMode'; import { getJavascriptMode } from './javascriptMode'; import { getHTMLMode } from './htmlMode'; @@ -35,11 +35,16 @@ export interface LanguageMode { export interface LanguageModes { getModeAtPosition(document: TextDocument, position: Position): LanguageMode; + getModesInRange(document: TextDocument, range: Range): LanguageModeRange[]; getAllModesInDocument(document: TextDocument): LanguageMode[]; getAllModes(): LanguageMode[]; getMode(languageId: string): LanguageMode; } +export interface LanguageModeRange extends Range { + mode: LanguageMode; +} + export function getLanguageModes(supportedLanguages: { [languageId: string]: boolean; }): LanguageModes { var htmlLanguageService = getHTMLLanguageService(); @@ -69,6 +74,15 @@ export function getLanguageModes(supportedLanguages: { [languageId: string]: boo } return result; }, + getModesInRange(document: TextDocument, range: Range): LanguageModeRange[] { + return getLanguagesInRange(htmlLanguageService, document, htmlDocuments.get(document), range).map(r => { + return { + start: r.start, + end: r.end, + mode: modes[r.languageId] + }; + }); + }, getAllModes(): LanguageMode[] { let result = []; for (let languageId in modes) { diff --git a/extensions/html/server/src/test/formatting.test.ts b/extensions/html/server/src/test/formatting.test.ts new file mode 100644 index 00000000000..1aaf6075848 --- /dev/null +++ b/extensions/html/server/src/test/formatting.test.ts @@ -0,0 +1,108 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +'use strict'; + +import * as assert from 'assert'; +import { getLanguageModes } from '../modes/languageModes'; +import { TextDocument, Range, TextEdit, FormattingOptions } from 'vscode-languageserver-types'; + +suite('HTML Embedded Formatting', () => { + + function assertFormat(value: string, expected: string, options?: any): void { + var languageModes = getLanguageModes({ css: true, javascript: true }); + if (options) { + languageModes.getAllModes().forEach(m => m.configure(options)); + } + + let rangeStartOffset = value.indexOf('|'); + let rangeEndOffset; + if (rangeStartOffset !== -1) { + value = value.substr(0, rangeStartOffset) + value.substr(rangeStartOffset + 1); + + rangeEndOffset = value.indexOf('|'); + value = value.substr(0, rangeEndOffset) + value.substr(rangeEndOffset + 1); + } else { + rangeStartOffset = 0; + rangeEndOffset = value.length; + } + let document = TextDocument.create('test://test/test.html', 'html', 0, value); + let range = Range.create(document.positionAt(rangeStartOffset), document.positionAt(rangeEndOffset)); + let formatOptions = FormattingOptions.create(2, true); + + let ranges = languageModes.getModesInRange(document, range); + let result: TextEdit[] = []; + ranges.forEach(r => { + let mode = r.mode; + if (mode && mode.format) { + let edits = mode.format(document, r, formatOptions); + pushAll(result, edits); + } + }); + let actual = applyEdits(document, result); + assert.equal(actual, expected); + } + + test('HTML only', function (): any { + assertFormat('

Hello

', '\n\n\n

Hello

\n\n\n'); + assertFormat('|

Hello

|', '\n\n\n

Hello

\n\n\n'); + assertFormat('|

Hello

|', '\n

Hello

\n'); + }); + + test('HTML & Scripts', function (): any { + assertFormat('', '\n\n\n \n\n\n'); + assertFormat('', '\n\n\n \n\n\n'); + assertFormat('', '\n\n\n \n\n\n'); + assertFormat('\n ', '\n\n\n \n\n\n'); + assertFormat('\n ', '\n\n\n \n\n\n'); + + assertFormat('\n ||', '\n '); + assertFormat('\n ', '\n '); + }); + + test('HTML & Multiple Scripts', function (): any { + assertFormat('\n', '\n\n\n \n\n\n\n'); + }); + + test('HTML & Styles', function (): any { + assertFormat('\n', '\n\n\n \n\n\n'); + }); + + test('EndWithNewline', function (): any { + let options = { + html: { + format: { + endWithNewline : true + } + } + }; + assertFormat('

Hello

', '\n\n\n

Hello

\n\n\n\n', options); + assertFormat('|

Hello

|', '\n

Hello

\n', options); + assertFormat('', '\n\n\n \n\n\n\n', options); + }); + +}); + +function pushAll(to: T[], from: T[]) { + if (from) { + for (var i = 0; i < from.length; i++) { + to.push(from[i]); + } + } +} + +function applyEdits(document: TextDocument, edits: TextEdit[]): string { + let text = document.getText(); + let sortedEdits = edits.sort((a, b) => document.offsetAt(b.range.start) - document.offsetAt(a.range.start)); + let lastOffset = text.length; + sortedEdits.forEach(e => { + let startOffset = document.offsetAt(e.range.start); + let endOffset = document.offsetAt(e.range.end); + assert.ok(startOffset <= endOffset); + assert.ok(endOffset <= lastOffset); + text = text.substring(0, startOffset) + e.newText + text.substring(endOffset, text.length); + lastOffset = startOffset; + }); + return text; +} \ No newline at end of file diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json index 3e9a33e4824..e243d04c4b5 100644 --- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json +++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json @@ -1064,6 +1064,9 @@ { "include": "#indexer-declaration" }, + { + "include": "#indexer-mapped-type-declaration" + }, { "include": "#field-declaration" }, @@ -1269,6 +1272,38 @@ } ] }, + "indexer-mapped-type-declaration": { + "name": "meta.indexer.mappedtype.declaration.js", + "begin": "(?:(?“终止任务”", "TaskSystem.exitAnyways": "仍然退出(&&E)", "TaskSystem.invalidTaskJson": "错误: tasks.json 文件的内容具有语法错误。请先更正错误然后再执行任务。\n", "TaskSystem.noBuildType": "未配置任何有效的任务运行程序。支持的任务运行程序是“服务”和“程序”。", diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json index 271a00862d2..3f59d1dfb37 100644 --- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "terminal.integrated.copySelection.noSelection": "当终端没有位于焦点时无法复制终端选定内容", - "terminal.integrated.exitedWithCode": "通过退出代码 {0} 终止的终端进程" + "terminal.integrated.exitedWithCode": "通过退出代码 {0} 终止的终端进程", + "terminal.integrated.launchFailed": "终端进程命令“{0} {1}”无法启动(退出代码: {2})" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/chs/src/vs/workbench/services/message/browser/messageList.i18n.json new file mode 100644 index 00000000000..c192951d72a --- /dev/null +++ b/i18n/chs/src/vs/workbench/services/message/browser/messageList.i18n.json @@ -0,0 +1,14 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "alertErrorMessage": "错误: {0}", + "alertInfoMessage": "信息: {0}", + "alertWarningMessage": "警告: {0}", + "close": "关闭", + "error": "错误", + "info": "信息", + "warning": "警告" +} \ No newline at end of file diff --git a/i18n/cht/extensions/typescript/package.i18n.json b/i18n/cht/extensions/typescript/package.i18n.json index e9880e63df2..c779dedc72f 100644 --- a/i18n/cht/extensions/typescript/package.i18n.json +++ b/i18n/cht/extensions/typescript/package.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "configuration.typescript": "TypeScript。", + "configuration.typescript": "TypeScript", "format.insertSpaceAfterCommaDelimiter": "定義逗號分隔符號後的空格處理。", "format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "定義匿名函式之函式關鍵字後的空格處理。", "format.insertSpaceAfterKeywordsInControlFlowStatements": "定義控制流程陳述式內關鍵字後的空格處理。", diff --git a/i18n/cht/src/vs/code/electron-main/menus.i18n.json b/i18n/cht/src/vs/code/electron-main/menus.i18n.json index 76081fc9506..c66593eb6b1 100644 --- a/i18n/cht/src/vs/code/electron-main/menus.i18n.json +++ b/i18n/cht/src/vs/code/electron-main/menus.i18n.json @@ -46,6 +46,7 @@ "miGotoLine": "移至行(&&L)...", "miGotoSymbolInFile": "前往檔案中的符號(&&S)...", "miGotoSymbolInWorkspace": "前往工作區中的符號(&&W)...", + "miHideActivityBar": "隱藏活動列(&&A)", "miHideStatusbar": "隱藏狀態列(&&H)", "miInstallingUpdate": "正在安裝更新...", "miIntroductoryVideos": "簡介影片(&&V)", @@ -88,6 +89,7 @@ "miSelectAll": "全選(&&S)", "miSelectColorTheme": "色彩佈景主題(&&C)", "miSelectIconTheme": "檔案圖示佈景主題(&&I)", + "miShowActivityBar": "顯示活動列(&&A)", "miShowStatusbar": "顯示狀態列(&&S)", "miSplitEditor": "分割編輯器(&&E)", "miSwitchEditor": "切換編輯器(&&E)", diff --git a/i18n/cht/src/vs/code/electron-main/windows.i18n.json b/i18n/cht/src/vs/code/electron-main/windows.i18n.json index 3821acc2d8c..40617cf4bcc 100644 --- a/i18n/cht/src/vs/code/electron-main/windows.i18n.json +++ b/i18n/cht/src/vs/code/electron-main/windows.i18n.json @@ -10,10 +10,14 @@ "appStalled": "視窗已沒有回應", "appStalledDetail": "您可以重新開啟或關閉視窗，或是繼續等候。", "close": "關閉", + "folderDesc": "{0} {1}", "hiddenMenuBar": "您仍然可以按 **Alt** 鍵來存取功能表列。", + "newWindow": "開新視窗", + "newWindowDesc": "開啟新視窗", "ok": "確定", "pathNotExistDetail": "磁碟上似乎已沒有路徑 '{0}'。", "pathNotExistTitle": "路徑不存在", + "recentFolders": "最近使用的資料夾", "reopen": "重新開啟", "wait": "繼續等候" } \ No newline at end of file diff --git a/i18n/cht/src/vs/code/node/cliProcessMain.i18n.json b/i18n/cht/src/vs/code/node/cliProcessMain.i18n.json index ac5a4b72caf..f74cd3a051e 100644 --- a/i18n/cht/src/vs/code/node/cliProcessMain.i18n.json +++ b/i18n/cht/src/vs/code/node/cliProcessMain.i18n.json @@ -11,7 +11,7 @@ "notInstalled": "未安裝擴充功能 '{0}'。", "successInstall": "已成功安裝擴充功能 '{0}' v{1}!", "successUninstall": "已成功將擴充功能 '{0}' 解除安裝!", - "successVsixInstall": "已成功安裝擴充功能 '{0}'!", + "successVsixInstall": "已成功安裝延伸模組 '{0}'!", "uninstalling": "正在將 {0} 解除安裝...", "useId": "請確定您使用完整擴充功能識別碼 (包括發行者)，例如: {0}" } \ No newline at end of file diff --git a/i18n/cht/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/cht/src/vs/editor/common/services/modelServiceImpl.i18n.json index 7254a4af357..da0e054c7f9 100644 --- a/i18n/cht/src/vs/editor/common/services/modelServiceImpl.i18n.json +++ b/i18n/cht/src/vs/editor/common/services/modelServiceImpl.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "diagAndSource": "[{0}] {1}", + "diagAndSourceMultiline": "[{0}]\n{1}", "indentAutoMigrate": "請更新您的設定: `editor.detect Indentation` 會取代 `editor.tabSize`: \"auto\" 或 `editor.insertSpaces`: \"auto\"" } \ No newline at end of file diff --git a/i18n/cht/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/cht/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json new file mode 100644 index 00000000000..d14963109ee --- /dev/null +++ b/i18n/cht/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json @@ -0,0 +1,19 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "parseErrors": "剖析 {0} 時發生錯誤: {1}", + "schema.autoClosingPairs": "定義成對括弧。輸入左括弧時，即自動插入右括弧。", + "schema.autoClosingPairs.notIn": "定義停用自動配對的範圍清單。", + "schema.blockComment.begin": "區塊註解開頭的字元順序。", + "schema.blockComment.end": "區塊註解結尾的字元順序。", + "schema.blockComments": "定義標記區塊註解的方式。", + "schema.brackets": "定義增加或減少縮排的括弧符號。", + "schema.closeBracket": "右括弧字元或字串順序。", + "schema.comments": "定義註解符號", + "schema.lineComment": "行註解開頭的字元順序。", + "schema.openBracket": "左括弧字元或字串順序。", + "schema.surroundingPairs": "定義可用以括住所選字串的成對括弧。" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/cht/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json new file mode 100644 index 00000000000..978d3169f18 --- /dev/null +++ b/i18n/cht/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noWorkspace": "沒有任何工作區。" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/platform/request/node/request.i18n.json b/i18n/cht/src/vs/platform/request/node/request.i18n.json new file mode 100644 index 00000000000..29b3a5b0271 --- /dev/null +++ b/i18n/cht/src/vs/platform/request/node/request.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "httpConfigurationTitle": "HTTP", + "proxy": "要使用的 Proxy 設定。如果未設定，會從 http_proxy 與 https_proxy 環境變數取得設定。", + "proxyAuthorization": "要傳送作為每個網路要求 'Proxy-Authorization' 標頭的值。", + "strictSSL": "是否應該針對提供的 CA 清單驗證 Proxy 伺服器憑證。" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/cht/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json new file mode 100644 index 00000000000..a1382e0edf8 --- /dev/null +++ b/i18n/cht/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider '{0}' 無法提供根節點。", + "treeExplorer.failedToResolveChildren": "TreeExplorerNodeProvider '{0}' 無法 resolveChildren。", + "treeExplorer.notRegistered": "未註冊識別碼為 '{0}' 的 TreeExplorerNodeProvider。" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/cht/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json new file mode 100644 index 00000000000..6770bb3ba96 --- /dev/null +++ b/i18n/cht/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionUnderDevelopment": "正在載入位於 {0} 的開發延伸模組", + "overwritingExtension": "正在以 {1} 覆寫延伸模組 {0}。" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json new file mode 100644 index 00000000000..6b710900234 --- /dev/null +++ b/i18n/cht/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "toggleActivityBar": "切換活動列可見度", + "view": "檢視" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/panel/panelPart.i18n.json index 6fafd26f66a..555a4cf0be6 100644 --- a/i18n/cht/src/vs/workbench/browser/parts/panel/panelPart.i18n.json +++ b/i18n/cht/src/vs/workbench/browser/parts/panel/panelPart.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closePanel": "關閉", + "closePanel": "關閉面板", "focusPanel": "將焦點移至面板", "toggleMaximizedPanel": "切換最大化面板", "togglePanel": "切換面板", diff --git a/i18n/cht/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json index d16c7b60767..036a6a18eba 100644 --- a/i18n/cht/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json +++ b/i18n/cht/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json @@ -13,5 +13,5 @@ "noResultsFound1": "找不到結果", "pickHistory": "選取編輯器輸入即可從歷程記錄移除", "quickOpenInput": "輸入 '?' 即可取得相關說明來了解您可以在這裡執行的動作", - "removeFromEditorHistory": "從編輯器記錄中移除" + "removeFromEditorHistory": "從記錄中移除" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json index f718df237a7..0e262319dfd 100644 --- a/i18n/cht/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json +++ b/i18n/cht/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json @@ -4,5 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "canNotRun": "無法從這裡執行命令 '{0}'。" + "canNotRun": "命令 '{0}' 目前未啟用，因此無法執行。" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/extensionHost.i18n.json new file mode 100644 index 00000000000..7a3b3dab3f5 --- /dev/null +++ b/i18n/cht/src/vs/workbench/electron-browser/extensionHost.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionHostProcess.crash": "延伸主機意外終止。請重新載入視窗以復原。", + "extensionHostProcess.error": "延伸主機發生錯誤: {0}", + "extensionHostProcess.startupFail": "延伸主機未在 10 秒內啟動，可能發生了問題。", + "extensionHostProcess.startupFailDebug": "延伸主機未於 10 秒內開始，可能在第一行就已停止，並需要偵錯工具才能繼續。" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/electron-browser/integration.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/integration.i18n.json index 9e8cdf97d57..c3565205d4c 100644 --- a/i18n/cht/src/vs/workbench/electron-browser/integration.i18n.json +++ b/i18n/cht/src/vs/workbench/electron-browser/integration.i18n.json @@ -6,10 +6,8 @@ { "copy": "複製", "cut": "剪下", - "files": "檔案", - "folders": "資料夾", - "openRecentPlaceHolder": "選取要開啟的路徑 (按住 Ctrl 鍵以在新視窗開啟)", - "openRecentPlaceHolderMac": "選取路徑 (按住 Cmd 鍵以在新視窗開啟)", + "developer": "開發人員", + "file": "檔案", "paste": "貼上", "redo": "取消復原", "selectAll": "全選", diff --git a/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json index 2cb4d92cdf1..4509cad9f93 100644 --- a/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "activityBarVisibility": "控制活動列在 workbench 中的可見度。", "closeOnFocusLost": "控制是否在 Quick Open 失去焦點時自動關閉。", - "developer": "開發人員", "editorOpenPositioning": "控制要在何處開啟編輯器。選取 [左] 或 [右] 在目前使用中編輯器的左側或右側開啟編輯器。選取 [先] 或 [後] 從目前使用中編輯器另外開啟編輯器。", "enablePreview": "控制已開啟的編輯器是否顯示為預覽。預覽編輯器會重複使用到被保留 (例如按兩下或進行編輯) 為止。", "enablePreviewFromQuickOpen": "控制透過 Quick Open 所開啟的編輯器是否顯示為預覽。預覽編輯器會重複使用到被保留 (例如按兩下或進行編輯) 為止。", @@ -15,12 +15,13 @@ "openFilesInNewWindow": "啟用時，會在新視窗中開啟檔案，而不是重複使用現有的執行個體。", "reopenFolders": "控制重新啟動後重新開啟資料夾的方式。選取 [none] 永不重新開啟資料夾，選取 [one] 重新開啟最近一個使用的資料夾，或選取 [all] 重新開啟上一個工作階段的所有資料夾。", "restoreFullscreen": "控制當視窗在全螢幕模式下結束後，下次是否仍以全螢幕模式開啟。", + "showEditorTabCloseButton": "控制是否顯示編輯器索引標籤的 [關閉] 按鈕。", "showEditorTabs": "控制已開啟的編輯器是否應顯示在索引標籤中。", + "showFullPath": "如果啟用，將會在視窗標題中顯示所開啟檔案的完整路徑。", "showIcons": "控制開啟的編輯器是否搭配圖示顯示。這需要同時啟用圖示佈景主題。", "sideBarLocation": "控制項資訊看板的位置。可顯示於 Workbench 的左方或右方。", "statusBarVisibility": "控制 Workbench 底端狀態列的可視性。", - "updateChannel": "設定是否要從更新頻道接收自動更新。變更後需要重新啟動。", - "updateConfigurationTitle": "更新", + "titleBarStyle": "調整視窗標題列的外觀。變更需要完整重新啟動才會套用。", "view": "檢視", "windowConfigurationTitle": "視窗", "workbenchConfigurationTitle": "Workbench", diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json index d1ad377de67..19fe9caffe6 100644 --- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json @@ -10,18 +10,16 @@ "addToWatchExpressions": "加入監看", "addWatchExpression": "加入運算式", "clearRepl": "清除主控台", - "conditionalBreakpointEditorAction": "偵錯: 新增條件中斷點...", "continueDebug": "繼續", "deactivateBreakpoints": "停用中斷點", - "debugAddToWatch": "偵錯: 加入監看", "debugConsoleAction": "偵錯主控台", - "debugEvaluate": "偵錯: 評估", "debugFocusConsole": "焦點偵錯主控台", "disableAllBreakpoints": "停用所有中斷點", "disconnectDebug": "中斷連接", "editConditionalBreakpoint": "編輯中斷點...", "editWatchExpression": "編輯運算式", "enableAllBreakpoints": "啟用所有中斷點", + "focusProcess": "焦點處理序", "launchJsonNeedsConfigurtion": "設定或修正 'launch.json'", "openLaunchJson": "開啟 {0}", "pauseDebug": "暫停", @@ -34,10 +32,9 @@ "renameFunctionBreakpoint": "重新命名函式中斷點", "restartDebug": "重新啟動", "restartFrame": "重新啟動框架", - "runToCursor": "偵錯: 執行至游標處", + "reverseContinue": "反向", "selectConfig": "選取組態", "setValue": "設定值", - "showDebugHover": "偵錯: 動態顯示", "startDebug": "開始偵錯", "startWithoutDebugging": "開始但不偵錯", "stepBackDebug": "倒退", @@ -45,7 +42,6 @@ "stepOutDebug": "跳離函式", "stepOverDebug": "不進入函式", "stopDebug": "停止", - "toggleBreakpointAction": "偵錯: 切換中斷點", "toggleEnablement": "啟用/停用中斷點", "unreadOutput": "偵錯主控台中的新輸出" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json new file mode 100644 index 00000000000..d76d67f91b5 --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json @@ -0,0 +1,13 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "conditionalBreakpointEditorAction": "偵錯: 新增條件中斷點...", + "debugAddToWatch": "偵錯: 加入監看", + "debugEvaluate": "偵錯: 評估", + "runToCursor": "偵錯: 執行至游標處", + "showDebugHover": "偵錯: 動態顯示", + "toggleBreakpointAction": "偵錯: 切換中斷點" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/common/debug.i18n.json new file mode 100644 index 00000000000..0d05f71bf63 --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/debug/common/debug.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noConfigurations": "沒有組態" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json index 418944f284c..f68619e7017 100644 --- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json @@ -12,6 +12,7 @@ "functionBreakpointsNotSupported": "此偵錯類型不支援函式中斷點", "loadMoreStackFrames": "載入更多堆疊框架", "paused": "已暫停", + "pausedOn": "暫停於 {0}", "process": "處理序", "running": "正在執行", "stackFrameAriaLabel": "堆疊框架 {0} 第 {1} {2} 行，呼叫堆疊，偵錯", diff --git a/i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json index ec9d631d506..9d5c08f2409 100644 --- a/i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debugConfigurationNames": "會隨這項 \"composite\" 組態啟動的組態。只在此組態的類型為 \"composite\" 採用。", "debugLinuxConfiguration": "Linux 特定的啟動設定屬性。", "debugName": "組態的名稱; 出現在啟動組態下拉式功能表中。", "debugOSXConfiguration": "OS X 特定的啟動設定屬性。", "debugPrelaunchTask": "偵錯工作階段啟動前要執行的工作。", "debugRequest": "要求組態的類型。可以是 [啟動] 或 [附加]。", + "debugServer": "僅限偵錯延伸模組開發: 如果指定了連接埠，VS Code 會嘗試連線至以伺服器模式執行的偵錯配接器", "debugType": "組態的類型。", "debugWindowsConfiguration": "Windows 特定的啟動設定屬性。", "internalConsoleOptions": "內部偵錯主控台的控制項行為。", diff --git a/i18n/cht/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json index 70695dea674..a0997a4a036 100644 --- a/i18n/cht/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json @@ -6,6 +6,7 @@ { "DebugConfig.failed": "無法在 '.vscode' 資料夾 ({0}) 中建立 'launch.json' 檔案。", "app.launch.json.configurations": "組態清單。請使用 IntelliSense 新增新的組態或編輯現有的組態。", + "app.launch.json.debugServer": "取代: 請移除組態中的 debugServer。", "app.launch.json.title": "啟動", "app.launch.json.version": "此檔案格式的版本。", "debugNoType": "偵錯配接器 'type' 不能省略且必須屬於 'string' 類型。", diff --git a/i18n/cht/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json b/i18n/cht/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json new file mode 100644 index 00000000000..a2e994a5f21 --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.noMatchingProviderId": "未註冊識別碼為 {providerId} 的 TreeExplorerNodeProvider。" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json new file mode 100644 index 00000000000..1bb880788c2 --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.invalidId": "樹狀總管延伸模組 {0} 的識別碼無效而無法啟動。", + "vscode.extension.contributes.explorer": "提供自訂樹狀總管 viewlet 到資訊看板", + "vscode.extension.contributes.explorer.icon": "活動列上 viewlet 圖示的路徑", + "vscode.extension.contributes.explorer.treeExplorerNodeProviderId": "用以識別透過 vscode.workspace.registerTreeExplorerNodeProvider 所註冊之提供者的唯一識別碼", + "vscode.extension.contributes.explorer.treeLabel": "用以轉譯自訂樹狀總管的易讀字串" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json new file mode 100644 index 00000000000..9166da850d4 --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "disable": "停用", + "enable": "啟用", + "treeExplorer.toggle": "切換自訂總管", + "view": "檢視" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json new file mode 100644 index 00000000000..194d609686e --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "refresh": "重新整理" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/cht/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json new file mode 100644 index 00000000000..fc3c5f0fa19 --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorerViewlet.tree": "樹狀總管區段" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json new file mode 100644 index 00000000000..894d69fdae9 --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "Unknown Dependency": "未知的相依性:", + "error": "錯誤" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json new file mode 100644 index 00000000000..505294ab013 --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json @@ -0,0 +1,39 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "JSON Validation": "JSON 驗證 ({0})", + "changelog": "變更記錄", + "command name": "名稱", + "commands": "命令 ({0})", + "contributions": "貢獻", + "debugger name": "名稱", + "debuggers": "偵錯工具 ({0})", + "default": "預設", + "dependencies": "相依性", + "description": "描述", + "details": "詳細資料", + "extension id": "延伸模組識別碼", + "file extensions": "副檔名", + "grammar": "文法", + "install count": "安裝計數", + "keyboard shortcuts": "鍵盤快速鍵(&&K)", + "language id": "識別碼", + "language name": "名稱", + "languages": "語言 ({0})", + "license": "授權", + "menuContexts": "功能表內容", + "name": "延伸模組名稱", + "noChangelog": "沒有可用的 Changelog。", + "noContributions": "沒有比重", + "noDependencies": "沒有相依性", + "noReadme": "沒有可用的讀我檔案。", + "publisher": "發行者名稱", + "rating": "評等", + "setting name": "名稱", + "settings": "設定 ({0})", + "snippets": "程式碼片段", + "themes": "佈景主題 ({0})" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json new file mode 100644 index 00000000000..c153aa76b9d --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "close": "關閉", + "neverShowAgain": "不要再顯示", + "reallyRecommended": "建議您安裝 '{0}' 擴充功能。", + "showRecommendations": "顯示建議", + "workspaceRecommended": "此工作區具有延伸模組建議。" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json new file mode 100644 index 00000000000..59c8a90c716 --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json @@ -0,0 +1,38 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "ConfigureWorkspaceRecommendations.noWorkspace": "只有在工作區資料夾中才能使用建議。", + "OpenExtensionsFile.failed": "無法在 '.vscode' 資料夾 ({0}) 中建立 'extensions.json' 檔案。", + "Uninstalling": "正在解除安裝", + "builtin": "內建", + "clearExtensionsInput": "清除擴充功能輸入", + "configureWorkspaceRecommendedExtensions": "設定建議的延伸模組 (工作區)", + "disableAction": "停用", + "disableAlwaysAction.label": "停用", + "disableForWorkspaceAction": "工作區", + "disableForWorkspaceAction.label": "停用 (工作區)", + "disableGloballyAction": "永遠", + "enableAction": "啟用", + "enableAlwaysAction.label": "啟用", + "enableForWorkspaceAction": "工作區", + "enableForWorkspaceAction.label": "啟用 (工作區)", + "enableGloballyAction": "永遠", + "installAction": "安裝", + "installExtensions": "安裝擴充功能", + "installing": "正在安裝", + "postUninstallTooltip": "重新載入以停用", + "reloadAction": "重新載入", + "showDisabledExtensions": "顯示停用的延伸模組", + "showInstalledExtensions": "顯示安裝的擴充功能", + "showOutdatedExtensions": "顯示過期的擴充功能", + "showPopularExtensions": "顯示熱門擴充功能", + "showRecommendedExtensions": "顯示建議的擴充功能", + "showWorkspaceRecommendedExtensions": "顯示工作區的建議擴充功能", + "toggleExtensionsViewlet": "顯示擴充功能", + "uninstallAction": "解除安裝", + "updateAction": "更新", + "updateAll": "更新所有擴充功能" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json new file mode 100644 index 00000000000..f475575fe95 --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "manage": "按 Enter 即可管理您的擴充功能。", + "noExtensionsToInstall": "輸入擴充功能名稱", + "searchFor": "按 Enter 即可在 Marketplace 中搜尋 '{0}'。" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json new file mode 100644 index 00000000000..b8bf44db113 --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "app.extension.identifier.errorMessage": "格式應為 '${publisher}.${name}'。範例: 'vscode.csharp'。", + "app.extensions.json.recommendations": "擴充功能的建議清單。擴充功能的識別碼一律為 '${publisher}.${name}'。例如: 'vscode.csharp'。", + "app.extensions.json.title": "擴充功能" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json new file mode 100644 index 00000000000..5b2858e7907 --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionsInputName": "擴充功能: {0}" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json index f3f7f33d0a4..348ba13f14d 100644 --- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json @@ -4,49 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "ConfigureWorkspaceRecommendations.noWorkspace": "只有在工作區資料夾中才能使用建議。", - "OpenExtensionsFile.failed": "無法在 '.vscode' 資料夾 ({0}) 中建立 'extensions.json' 檔案。", - "Uninstalling": "正在解除安裝", - "builtin": "內建", - "clearExtensionsInput": "清除擴充功能輸入", - "configureWorkspaceRecommendedExtensions": "設定建議的延伸模組 (工作區)", - "disableAction": "停用", - "disableAll": "全部停用", - "disableAllWorkspace": "全部停用 (工作區)", - "disableAlwaysAction.label": "停用", - "disableForWorkspaceAction": "工作區", - "disableForWorkspaceAction.label": "停用 (工作區)", - "disableGloballyAction": "永遠", - "enableAction": "啟用", - "enableAll": "全部啟用", - "enableAllWorkspace": "全部啟用 (工作區)", - "enableAlwaysAction.label": "啟用", - "enableForWorkspaceAction": "工作區", - "enableForWorkspaceAction.label": "啟用 (工作區)", - "enableGloballyAction": "永遠", - "installAction": "安裝", - "installExtensions": "安裝擴充功能", + "InstallVSIXAction.reloadNow": "立即重新載入", + "InstallVSIXAction.success": "已成功安裝延伸模組。請重新啟動以啟用。", "installVSIX": "從 VSIX 安裝...", - "installing": "正在安裝", - "openExtensionsFolder": "開啟擴充功能資料夾", - "postDisableMessage": "要重新載入此視窗以停用 '{0}' 延伸模組嗎?", - "postDisableTooltip": "重新載入以停用", - "postEnableMessage": "要重新載入此視窗以啟用 '{0}' 延伸模組嗎?", - "postEnableTooltip": "重新載入以啟用", - "postInstallMessage": "要重新載入此視窗以啟動 '{0}' 延伸模組嗎?", - "postInstallTooltip": "重新載入以啟動", - "postUninstallMessage": "要重新載入此視窗以停用 '{0}' 延伸模組嗎?", - "postUninstallTooltip": "重新載入以停用", - "reloadAction": "重新載入", - "reloadNow": "立即重新載入", - "showDisabledExtensions": "顯示停用的延伸模組", - "showInstalledExtensions": "顯示安裝的擴充功能", - "showOutdatedExtensions": "顯示過期的擴充功能", - "showPopularExtensions": "顯示熱門擴充功能", - "showRecommendedExtensions": "顯示建議的擴充功能", - "showWorkspaceRecommendedExtensions": "顯示工作區的建議擴充功能", - "toggleExtensionsViewlet": "顯示擴充功能", - "uninstallAction": "解除安裝", - "updateAction": "更新", - "updateAll": "更新所有擴充功能" + "openExtensionsFolder": "開啟延伸模組資料夾" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json index b1f684fbd05..5e94215bc72 100644 --- a/i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json @@ -20,10 +20,11 @@ "files.exclude.when": "在相符檔案同層級上額外的檢查。請使用 $(basename) 作為相符檔案名稱的變數。", "filesConfigurationTitle": "檔案", "formatOnSave": "在儲存時設定檔案格式。格式器必須處於可用狀態、檔案不得自動儲存，且編輯器不得關機。", + "insertFinalNewline": "啟用時，請在儲存檔案時在其結尾插入最後一個新行。", "openEditorsVisible": "[開放式編輯器] 窗格中顯示的編輯器數目。將其設定為 0 以隱藏窗格。", "showExplorerViewlet": "顯示檔案總管", "textFileEditor": "文字檔編輯器", - "trimTrailingWhitespace": "若啟用，將在您儲存檔案時修剪尾端空白。", + "trimTrailingWhitespace": "若啟用，將在儲存檔案時修剪尾端空白。", "view": "檢視", "watcherExclude": "將檔案路徑的 Glob 模式設定為從檔案監控排除。需要重新啟動才能變更此設定。當您發現 Code 在啟動時使用大量 CPU 時間時，可以排除較大的資料夾以降低初始負載。" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/cht/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json index 5eb4b4bbdff..6408abea66a 100644 --- a/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "errors.warnings.show.label": "錯誤和警告", + "errors.warnings.show.label": "顯示錯誤和警告", "markers.panel.action.filter": "篩選問題", "markers.panel.aria.label.problems.tree": "依檔案分組的問題", "markers.panel.at.ln.col.number": "({0}, {1})", @@ -25,15 +25,15 @@ "markers.panel.title.problems": "問題", "problems.panel.configuration.autoreveal": "控制 [問題] 檢視是否應自動在開啟檔案時加以顯示", "problems.panel.configuration.title": "[問題] 檢視", - "problems.tree.aria.label.error.marker": "{0} 產生的錯誤: 在行 {2} 與欄 {3} 的 {1}", - "problems.tree.aria.label.error.marker.nosource": "錯誤: 在行 {1} 與欄 {2} 的 {0}", - "problems.tree.aria.label.info.marker": "{0} 產生的資訊: 在行 {2} 與欄 {3} 的 {1}", - "problems.tree.aria.label.info.marker.nosource": "資訊: 在行 {1} 與欄 {2} 的 {0}", - "problems.tree.aria.label.marker": "{0} 產生的問題: 在行 {2} 與欄 {3} 的 {1}", - "problems.tree.aria.label.marker.nosource": "問題: 在行 {1} 與欄 {2} 的 {0}", + "problems.tree.aria.label.error.marker": "{0} 產生的錯誤: 在行 {2} 與字元 {3} 的 {1}", + "problems.tree.aria.label.error.marker.nosource": "錯誤: 在行 {1} 與字元 {2} 的 {0}", + "problems.tree.aria.label.info.marker": "{0} 產生的資訊: 在行 {2} 與字元 {3} 的 {1}", + "problems.tree.aria.label.info.marker.nosource": "資訊: 在行 {1} 與字元 {2} 的 {0}", + "problems.tree.aria.label.marker": "{0} 產生的問題: 在行 {2} 與字元 {3} 的 {1}", + "problems.tree.aria.label.marker.nosource": "問題: 在行 {1} 與字元 {2} 的 {0}", "problems.tree.aria.label.resource": "發生 {1} 個問題的 {0}", - "problems.tree.aria.label.warning.marker": "{0} 產生的警告: 在行 {2} 與欄 {3} 的 {1}", - "problems.tree.aria.label.warning.marker.nosource": "警告: 在行 {1} 與欄 {2} 的 {0}", + "problems.tree.aria.label.warning.marker": "{0} 產生的警告: 在行 {2} 與字元 {3} 的 {1}", + "problems.tree.aria.label.warning.marker.nosource": "警告: 在行 {1} 與字元 {2} 的 {0}", "problems.view.show.label": "顯示問題", "viewCategory": "檢視" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json new file mode 100644 index 00000000000..66388e93b8b --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "neverAgain": "不要再顯示", + "remindLater": "稍後再提醒我", + "surveyQuestion": "您願意填寫簡短的意見反應問卷嗎?", + "takeSurvey": "填寫問卷" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json index cdbd7899063..308d8e65081 100644 --- a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json @@ -25,12 +25,12 @@ "JsonSchema.options.cwd": "所執行程式或指令碼的目前工作目錄。如果省略，則會使用 Code 的目前工作區根目錄。", "JsonSchema.options.env": "所執行程式或殼層的環境。如果省略，則會使用父處理序的環境。", "JsonSchema.pattern.code": "問題之代碼的符合群組索引。預設為未定義", - "JsonSchema.pattern.column": "問題之資料行的符合群組索引。預設為 3", - "JsonSchema.pattern.endColumn": "問題之結尾資料行的符合群組索引。預設為未定義", + "JsonSchema.pattern.column": "問題之行字元的符合群組索引。預設為 3", + "JsonSchema.pattern.endColumn": "問題之結尾行字元的符合群組索引。預設為未定義", "JsonSchema.pattern.endLine": "問題之結尾行的符合群組索引。預設為未定義", "JsonSchema.pattern.file": "檔案名稱的符合群組索引。如果省略，則會使用 1。", "JsonSchema.pattern.line": "問題之行的符合群組索引。預設為 2", - "JsonSchema.pattern.location": "問題之位置的符合群組索引。有效的位置模式為: (line)、(line,column) 和 (startLine,startColumn,endLine,endColumn)。如果省略，則會假設行與資料行。", + "JsonSchema.pattern.location": "問題之位置的符合群組索引。有效的位置模式為: (line)、(line,column) 和 (startLine,startColumn,endLine,endColumn)。如果省略，則會假設 (line,column)。", "JsonSchema.pattern.loop": "在多行比對器迴圈中，指出此模式是否只要相符就會以迴圈執行。只能在多行模式中的最後一個模式指定。", "JsonSchema.pattern.message": "訊息的符合群組索引。如果省略並指定位置，預設為 4。否則預設為 5。", "JsonSchema.pattern.regexp": "規則運算式，用來在輸出中尋找錯誤、警告或資訊。", @@ -69,7 +69,7 @@ "RunTaskAction.label": "執行工作", "ShowLogAction.label": "顯示工作記錄檔", "TaskSystem.active": "目前有使用中的工作正在執行。請先終止此工作，再執行其他工作。", - "TaskSystem.activeSame": "工作已在作用中並處於監看模式。", + "TaskSystem.activeSame": "工作已在作用中並處於監看模式。若要終止工作，請使用 F1 > [終止工作]", "TaskSystem.exitAnyways": "仍要結束(&&E)", "TaskSystem.invalidTaskJson": "錯誤: tasks.json 檔案的內容具有語法錯誤。請更正錯誤，再執行工作。\n", "TaskSystem.noBuildType": "未設定有效的工作執行器。支援的工作執行器為 [服務] 和 [程式]。", diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json index 4fe4f190811..a962a7d188b 100644 --- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "terminal.integrated.copySelection.noSelection": "無法在終端機沒有焦點時複製終端機選取範圍", - "terminal.integrated.exitedWithCode": "終端機處理序已終止，結束代碼為: {0}" + "terminal.integrated.exitedWithCode": "終端機處理序已終止，結束代碼為: {0}", + "terminal.integrated.launchFailed": "無法啟動終端機處理序命令 `{0}{1}` (結束代碼: {2})" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/services/history/browser/history.i18n.json b/i18n/cht/src/vs/workbench/services/history/browser/history.i18n.json index 400aaf3be7c..4e72f6ccd5e 100644 --- a/i18n/cht/src/vs/workbench/services/history/browser/history.i18n.json +++ b/i18n/cht/src/vs/workbench/services/history/browser/history.i18n.json @@ -5,7 +5,7 @@ // Do not edit this file. It is machine generated. { "devExtensionWindowTitle": "[擴充功能開發主機] - {0}", - "patchedWindowTitle": " [不支援]", + "patchedWindowTitle": "[不支援]", "prefixDecoration": "● {0}", "prefixTitle": "{0} - {1}", "prefixWorkspaceTitle": "{0} - {1} - {2}", diff --git a/i18n/cht/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/cht/src/vs/workbench/services/message/browser/messageList.i18n.json new file mode 100644 index 00000000000..58cefa0b307 --- /dev/null +++ b/i18n/cht/src/vs/workbench/services/message/browser/messageList.i18n.json @@ -0,0 +1,14 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "alertErrorMessage": "錯誤: {0}", + "alertInfoMessage": "資訊: {0}", + "alertWarningMessage": "警告: {0}", + "close": "關閉", + "error": "錯誤", + "info": "資訊", + "warning": "警告" +} \ No newline at end of file diff --git a/i18n/deu/extensions/typescript/package.i18n.json b/i18n/deu/extensions/typescript/package.i18n.json index 937eec157ec..5c5249e844d 100644 --- a/i18n/deu/extensions/typescript/package.i18n.json +++ b/i18n/deu/extensions/typescript/package.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "configuration.typescript": "TypeScript.", + "configuration.typescript": "TypeScript", "format.insertSpaceAfterCommaDelimiter": "Definiert die Verarbeitung von Leerzeichen nach einem Kommatrennzeichen.", "format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Definiert die Verarbeitung von Leerzeichen nach einem Funktionsschlüsselwort für anonyme Funktionen.", "format.insertSpaceAfterKeywordsInControlFlowStatements": "Definiert die Verarbeitung von Leerzeichen nach Schlüsselwörtern in einer Flusssteuerungsanweisung.", diff --git a/i18n/deu/src/vs/code/electron-main/menus.i18n.json b/i18n/deu/src/vs/code/electron-main/menus.i18n.json index 1cb0ef1803b..4c02f169d9c 100644 --- a/i18n/deu/src/vs/code/electron-main/menus.i18n.json +++ b/i18n/deu/src/vs/code/electron-main/menus.i18n.json @@ -46,6 +46,7 @@ "miGotoLine": "Gehe zu Zei&&le...", "miGotoSymbolInFile": "Gehe zu &&Symbol in Datei...", "miGotoSymbolInWorkspace": "Zu Symbol im &&Arbeitsbereich wechseln...", + "miHideActivityBar": "&&Aktivitätsleiste ausblenden", "miHideStatusbar": "&&Statusleiste ausblenden", "miInstallingUpdate": "Update wird installiert...", "miIntroductoryVideos": "&&Einführungsvideos", @@ -88,6 +89,7 @@ "miSelectAll": "&&Alles auswählen", "miSelectColorTheme": "&&Farbdesign", "miSelectIconTheme": "Datei- &&Symboldesign", + "miShowActivityBar": "&&Aktivitätsleiste anzeigen", "miShowStatusbar": "&&Statusleiste anzeigen", "miSplitEditor": "&&Editor teilen", "miSwitchEditor": "&&Editor wechseln", diff --git a/i18n/deu/src/vs/code/electron-main/windows.i18n.json b/i18n/deu/src/vs/code/electron-main/windows.i18n.json index 81f229b4502..2bc9b8fc3bb 100644 --- a/i18n/deu/src/vs/code/electron-main/windows.i18n.json +++ b/i18n/deu/src/vs/code/electron-main/windows.i18n.json @@ -10,10 +10,14 @@ "appStalled": "Das Fenster reagiert nicht mehr.", "appStalledDetail": "Sie können das Fenster erneut öffnen oder schließen oder weiterhin warten.", "close": "Schließen", + "folderDesc": "{0} {1}", "hiddenMenuBar": "Sie können weiterhin auf die Menüleiste zugreifen, in dem Sie die **ALT**-Taste drücken.", + "newWindow": "Neues Fenster", + "newWindowDesc": "Öffnet ein neues Fenster.", "ok": "OK", "pathNotExistDetail": "Der Pfad \"{0}\" scheint auf dem Datenträger nicht mehr vorhanden zu sein.", "pathNotExistTitle": "Der Pfad ist nicht vorhanden.", + "recentFolders": "Zuletzt verwendete Ordner", "reopen": "Erneut öffnen", "wait": "Bitte warten." } \ No newline at end of file diff --git a/i18n/deu/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/deu/src/vs/editor/common/services/modelServiceImpl.i18n.json index ed2bf1936fb..28d3fb2cc1f 100644 --- a/i18n/deu/src/vs/editor/common/services/modelServiceImpl.i18n.json +++ b/i18n/deu/src/vs/editor/common/services/modelServiceImpl.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "diagAndSource": "[{0}] {1}", + "diagAndSourceMultiline": "[{0}]\n{1}", "indentAutoMigrate": "Bitte aktualisieren Sie Ihre Einstellungen: \"editor.detectIndentation\" ersetzt \"editor.tabSize\": \"auto\" oder \"editor.insertSpaces\": \"auto\"" } \ No newline at end of file diff --git a/i18n/deu/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/deu/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json new file mode 100644 index 00000000000..017dda7ca84 --- /dev/null +++ b/i18n/deu/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json @@ -0,0 +1,19 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "parseErrors": "Fehler beim Analysieren von {0}: {1}", + "schema.autoClosingPairs": "Definiert die Klammerpaare. Wenn eine öffnende Klammer eingegeben wird, wird die schließende Klammer automatisch eingefügt.", + "schema.autoClosingPairs.notIn": "Definiert eine Liste von Bereichen, in denen die automatischen Paare deaktiviert sind.", + "schema.blockComment.begin": "Die Zeichenfolge, mit der ein Blockkommentar beginnt.", + "schema.blockComment.end": "Die Zeichenfolge, die einen Blockkommentar beendet.", + "schema.blockComments": "Definiert, wie Blockkommentare markiert werden.", + "schema.brackets": "Definiert die Klammersymbole, die den Einzug vergrößern oder verkleinern.", + "schema.closeBracket": "Das schließende Klammerzeichen oder die Zeichenfolgensequenz.", + "schema.comments": "Definiert die Kommentarsymbole.", + "schema.lineComment": "Die Zeichenfolge, mit der ein Zeilenkommentar beginnt.", + "schema.openBracket": "Das öffnende Klammerzeichen oder die Zeichenfolgensequenz.", + "schema.surroundingPairs": "Definiert die Klammerpaare, in die eine ausgewählte Zeichenfolge eingeschlossen werden kann." +} \ No newline at end of file diff --git a/i18n/deu/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/deu/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json new file mode 100644 index 00000000000..5758c64308c --- /dev/null +++ b/i18n/deu/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noWorkspace": "Kein Arbeitsbereich." +} \ No newline at end of file diff --git a/i18n/deu/src/vs/platform/request/node/request.i18n.json b/i18n/deu/src/vs/platform/request/node/request.i18n.json new file mode 100644 index 00000000000..fd11a59264d --- /dev/null +++ b/i18n/deu/src/vs/platform/request/node/request.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "httpConfigurationTitle": "HTTP", + "proxy": "Die zu verwendende Proxyeinstellung. Wenn diese Option nicht festgelegt wird, wird der Wert aus den Umgebungsvariablen \"http_proxy\" und \"https_proxy\" übernommen.", + "proxyAuthorization": "Der Wert, der als Proxy-Authorization-Header für jede Netzwerkanforderung gesendet werden soll.", + "strictSSL": "Gibt an, ob das Proxyserverzertifikat anhand der Liste der bereitgestellten Zertifizierungsstellen überprüft werden soll." +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/deu/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json new file mode 100644 index 00000000000..dc3347561ab --- /dev/null +++ b/i18n/deu/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider \"{0}\" hat keinen Stammknoten bereitgestellt.", + "treeExplorer.failedToResolveChildren": "TreeExplorerNodeProvider \"{0}\" hat \"resolveChildren\" nicht ausgeführt.", + "treeExplorer.notRegistered": "Es ist kein TreeExplorerNodeProvider mit ID \"{0}\" registriert." +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/deu/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json new file mode 100644 index 00000000000..a141a9a0e2b --- /dev/null +++ b/i18n/deu/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionUnderDevelopment": "Die Entwicklungserweiterung unter \"{0}\" wird geladen.", + "overwritingExtension": "Die Erweiterung \"{0}\" wird mit \"{1}\" überschrieben." +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json new file mode 100644 index 00000000000..4ff41ba9665 --- /dev/null +++ b/i18n/deu/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "toggleActivityBar": "Sichtbarkeit der Aktivitätsleiste umschalten", + "view": "Anzeigen" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/panel/panelPart.i18n.json index 61172b0055b..07adb94c64e 100644 --- a/i18n/deu/src/vs/workbench/browser/parts/panel/panelPart.i18n.json +++ b/i18n/deu/src/vs/workbench/browser/parts/panel/panelPart.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closePanel": "Schließen", + "closePanel": "Bereich schließen", "focusPanel": "Fokus im Bereich", "toggleMaximizedPanel": "Bereich maximieren/reduzieren", "togglePanel": "Bereich umschalten", diff --git a/i18n/deu/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json index a2c853dae37..7d7c086c6c8 100644 --- a/i18n/deu/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json +++ b/i18n/deu/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json @@ -13,5 +13,5 @@ "noResultsFound1": "Es wurden keine Ergebnisse gefunden.", "pickHistory": "Editor-Eintrag auswählen, der aus dem Verlauf entfernt werden soll", "quickOpenInput": "Geben Sie \"?\" ein, um Hilfe zu den Aktionen zu erhalten, die hier zur Verfügung stehen.", - "removeFromEditorHistory": "Aus Editor-Verlauf entfernen" + "removeFromEditorHistory": "Aus Verlauf entfernen" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json index 941ae987ac9..c991d0d66a3 100644 --- a/i18n/deu/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json +++ b/i18n/deu/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json @@ -4,5 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "canNotRun": "Der Befehl \"{0}\" kann hier nicht ausgeführt werden." + "canNotRun": "Der Befehl \"{0}\" ist zurzeit nicht aktiviert und kann nicht ausgeführt werden." } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/extensionHost.i18n.json new file mode 100644 index 00000000000..00cd41c1d9b --- /dev/null +++ b/i18n/deu/src/vs/workbench/electron-browser/extensionHost.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionHostProcess.crash": "Der Erweiterungshost wurde unerwartet beendet. Bitte laden Sie das Fenster erneut, um ihn wiederherzustellen.", + "extensionHostProcess.error": "Fehler vom Erweiterungshost: {0}", + "extensionHostProcess.startupFail": "Der Erweiterungshost wurde nicht innerhalb von 10 Sekunden gestartet. Dies stellt ggf. ein Problem dar.", + "extensionHostProcess.startupFailDebug": "Der Erweiterungshost wurde nicht innerhalb von 10 Sekunden gestartet. Möglicherweise wurde er in der ersten Zeile beendet und benötigt einen Debugger, um die Ausführung fortzusetzen." +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/electron-browser/integration.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/integration.i18n.json index 3aff4d86d2f..07034ef5246 100644 --- a/i18n/deu/src/vs/workbench/electron-browser/integration.i18n.json +++ b/i18n/deu/src/vs/workbench/electron-browser/integration.i18n.json @@ -6,10 +6,8 @@ { "copy": "Kopieren", "cut": "Ausschneiden", - "files": "Dateien", - "folders": "Ordner", - "openRecentPlaceHolder": "Wählen Sie einen zu öffnenden Pfad aus (halten Sie STRG gedrückt, um ein neues Fenster zu öffnen).", - "openRecentPlaceHolderMac": "Wählen Sie einen Pfad aus (halten Sie die BEFEHLSTASTE gedrückt, um ein neues Fenster zu öffnen).", + "developer": "Entwickler", + "file": "Datei", "paste": "Einfügen", "redo": "Wiederholen", "selectAll": "Alles auswählen", diff --git a/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json index badc76cdc8c..a174e157aff 100644 --- a/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json +++ b/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "activityBarVisibility": "Steuert die Sichtbarkeit der Aktivitätsleiste in der Workbench.", "closeOnFocusLost": "Steuert, ob Quick Open automatisch geschlossen werden soll, sobald das Feature den Fokus verliert.", - "developer": "Entwickler", "editorOpenPositioning": "Steuert, wo Editoren geöffnet werden. Wählen Sie \"Links\" oder \"Rechts\" aus, um Editoren links oder rechts vom aktuellen aktiven Editor zu öffnen. Wählen Sie \"Erster\" oder \"Letzter\" aus, um Editoren unabhängig vom aktuell aktiven Editor zu öffnen.", "enablePreview": "Steuert, ob geöffnete Editoren als Vorschau angezeigt werden. Vorschau-Editoren werden wiederverwendet, bis sie gespeichert werden (z. B. über Doppelklicken oder Bearbeiten).", "enablePreviewFromQuickOpen": "Steuert, ob geöffnete Editoren aus Quick Open als Vorschau angezeigt werden. Vorschau-Editoren werden wiederverwendet, bis sie gespeichert werden (z. B. über Doppelklicken oder Bearbeiten).", @@ -15,12 +15,13 @@ "openFilesInNewWindow": "Wenn diese Option aktiviert ist, werden Dateien in einem neuen Fenster geöffnet anstatt eine vorhandene Instanz wiederzuverwenden.", "reopenFolders": "Steuert, wie Ordner nach einem Neustart erneut geöffnet werden. Wählen Sie \"none\" aus, um Ordner nie erneut zu öffnen, \"one\", um den zuletzt bearbeiteten Ordner erneut zu öffnen, oder \"all\", um alle Ordner der letzten Sitzung erneut zu öffnen.", "restoreFullscreen": "Steuert, ob ein Fenster im Vollbildmodus wiederhergestellt wird, wenn es im Vollbildmodus beendet wurde.", + "showEditorTabCloseButton": "Steuert, ob Editor-Registerkarten eine sichtbare Schaltfläche zum Schließen aufweisen sollen oder nicht.", "showEditorTabs": "Steuert, ob geöffnete Editoren auf Registerkarten angezeigt werden sollen.", + "showFullPath": "Bei Aktivierung wird der vollständige Pfad geöffneter Dateien in der Titelleiste des Fensters angezeigt.", "showIcons": "Steuert, ob geöffnete Editoren mit einem Symbol angezeigt werden sollen. Hierzu muss auch ein Symboldesign aktiviert werden.", "sideBarLocation": "Steuert die Position der Seitenleiste. Diese kann entweder links oder rechts von der Workbench angezeigt werden.", "statusBarVisibility": "Steuert die Sichtbarkeit der Statusleiste im unteren Bereich der Workbench.", - "updateChannel": "Konfiguriert, ob automatische Updates aus einem Updatekanal empfangen werden sollen. Erfordert einen Neustart nach der Änderung.", - "updateConfigurationTitle": "Update", + "titleBarStyle": "Passt das Aussehen der Titelleiste des Fensters an. Zum Anwenden der Änderungen ist ein vollständiger Neustart erforderlich.", "view": "Anzeigen", "windowConfigurationTitle": "Fenster", "workbenchConfigurationTitle": "Workbench", diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json index e749f49e977..883e120e486 100644 --- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json @@ -10,18 +10,16 @@ "addToWatchExpressions": "Zur Überwachung hinzufügen", "addWatchExpression": "Ausdruck hinzufügen", "clearRepl": "Konsole löschen", - "conditionalBreakpointEditorAction": "Debuggen: Bedingten Haltepunkt hinzufügen...", "continueDebug": "Weiter", "deactivateBreakpoints": "Haltepunkte deaktivieren", - "debugAddToWatch": "Debuggen: Zur Überwachung hinzufügen", "debugConsoleAction": "Debugging-Konsole", - "debugEvaluate": "Debuggen: Auswerten", "debugFocusConsole": "Focus-Debugging-Konsole", "disableAllBreakpoints": "Alle Haltepunkte deaktivieren", "disconnectDebug": "Trennen", "editConditionalBreakpoint": "Haltepunkt bearbeiten...", "editWatchExpression": "Ausdruck bearbeiten", "enableAllBreakpoints": "Alle Haltepunkte aktivieren", + "focusProcess": "Fokus auf Prozess", "launchJsonNeedsConfigurtion": "Konfigurieren oder reparieren Sie \"launch.json\".", "openLaunchJson": "{0} öffnen", "pauseDebug": "Anhalten", @@ -34,10 +32,9 @@ "renameFunctionBreakpoint": "Funktionshaltepunkt umbenennen", "restartDebug": "Neu starten", "restartFrame": "Frame neu starten", - "runToCursor": "Debuggen: Ausführen bis Cursor", + "reverseContinue": "Umkehren", "selectConfig": "Konfiguration auswählen", "setValue": "Wert festlegen", - "showDebugHover": "Debuggen: Hover anzeigen", "startDebug": "Debuggen starten", "startWithoutDebugging": "Ohne Debuggen starten", "stepBackDebug": "Schritt zurück", @@ -45,7 +42,6 @@ "stepOutDebug": "Prozedurschritt", "stepOverDebug": "Prozedurschritt", "stopDebug": "Beenden", - "toggleBreakpointAction": "Debuggen: Haltepunkt umschalten", "toggleEnablement": "Haltepunkt aktivieren/deaktivieren", "unreadOutput": "Neue Ausgabe in Debugging-Konsole" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json new file mode 100644 index 00000000000..4cd8c9af3f0 --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json @@ -0,0 +1,13 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "conditionalBreakpointEditorAction": "Debuggen: Bedingten Haltepunkt hinzufügen...", + "debugAddToWatch": "Debuggen: Zur Überwachung hinzufügen", + "debugEvaluate": "Debuggen: Auswerten", + "runToCursor": "Debuggen: Ausführen bis Cursor", + "showDebugHover": "Debuggen: Hover anzeigen", + "toggleBreakpointAction": "Debuggen: Haltepunkt umschalten" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/common/debug.i18n.json new file mode 100644 index 00000000000..ed1cea83988 --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/debug/common/debug.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noConfigurations": "Keine Konfigurationen" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json index 04f120ca5de..c9b6e7e70cb 100644 --- a/i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debugConfigurationNames": "Konfigurationen, die im Rahmen dieser \"zusammengesetzten\" Konfiguration gestartet werden. Gilt nur, wenn der Typ dieser Konfiguration auf \"zusammengesetzt\" festgelegt ist.", "debugLinuxConfiguration": "Linux-spezifische Startkonfigurationsattribute.", "debugName": "Der Name der Konfiguration. Er wird im Dropdownmenü der Startkonfiguration angezeigt.", "debugOSXConfiguration": "OS X-spezifische Startkonfigurationsattribute.", "debugPrelaunchTask": "Ein Task, der ausgeführt werden soll, bevor die Debugsitzung beginnt.", "debugRequest": "Der Anforderungstyp der Konfiguration. Der Wert kann \"launch\" oder \"attach\" sein.", + "debugServer": "Nur für die Entwicklung von Debugerweiterungen: Wenn ein Port angegeben ist, versucht der VS-Code, eine Verbindung mit einem Debugadapter herzustellen, der im Servermodus ausgeführt wird.", "debugType": "Der Typ der Konfiguration.", "debugWindowsConfiguration": "Windows-spezifische Startkonfigurationsattribute.", "internalConsoleOptions": "Steuert das Verhalten der internen Debugging-Konsole.", diff --git a/i18n/deu/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json index 88fd460c894..786b048f418 100644 --- a/i18n/deu/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json @@ -6,6 +6,7 @@ { "DebugConfig.failed": "Die Datei \"launch.json\" kann nicht im Ordner \".vscode\" erstellt werden ({0}).", "app.launch.json.configurations": "Die Liste der Konfigurationen. Fügen Sie neue Konfigurationen hinzu, oder bearbeiten Sie vorhandene Konfigurationen mit IntelliSense.", + "app.launch.json.debugServer": "VERALTET: Verschieben Sie debugServer innerhalb einer Konfiguration.", "app.launch.json.title": "Starten", "app.launch.json.version": "Die Version dieses Dateiformats.", "debugNoType": "Der \"type\" des Debugadapters kann nicht ausgelassen werden und muss vom Typ \"string\" sein.", diff --git a/i18n/deu/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json b/i18n/deu/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json new file mode 100644 index 00000000000..f0e1bdb921d --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.noMatchingProviderId": "Es ist kein TreeExplorerNodeProvider mit ID \"{providerId}\" registriert." +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json new file mode 100644 index 00000000000..ff713f3f44f --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.invalidId": "Die Struktur-Explorer-Erweiterung \"{0}\" weist eine ungültige ID auf und konnte nicht aktiviert werden.", + "vscode.extension.contributes.explorer": "Stellt ein benutzerdefiniertes Viewlet für den Struktur-Explorer in der Seitenleiste zur Verfügung.", + "vscode.extension.contributes.explorer.icon": "Pfad zum Symbol des Viewlets auf der Aktivitätsleiste", + "vscode.extension.contributes.explorer.treeExplorerNodeProviderId": "Eindeutige ID zum Identifizieren des über vscode.workspace.registerTreeExplorerNodeProvider registrierten Anbieters", + "vscode.extension.contributes.explorer.treeLabel": "Visuell lesbare Zeichenfolge zur Darstellung des benutzerdefinierten Struktur-Explorers" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json new file mode 100644 index 00000000000..b670244c7d5 --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "disable": "Deaktivieren", + "enable": "Aktivieren", + "treeExplorer.toggle": "Benutzerdefinierten Explorer umschalten", + "view": "Anzeigen" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json new file mode 100644 index 00000000000..b3a9b658868 --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "refresh": "Aktualisieren" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/deu/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json new file mode 100644 index 00000000000..3f40c0a0570 --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorerViewlet.tree": "Abschnitt \"Struktur-Explorer\"" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json new file mode 100644 index 00000000000..0466b3b02bd --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "Unknown Dependency": "Unbekannte Abhängigkeit:", + "error": "Fehler" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json new file mode 100644 index 00000000000..f6ff22205fa --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json @@ -0,0 +1,39 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "JSON Validation": "JSON-Validierung ({0})", + "changelog": "ChangeLog", + "command name": "Name", + "commands": "Befehle ({0})", + "contributions": "Beiträge", + "debugger name": "Name", + "debuggers": "Debugger ({0})", + "default": "Standard", + "dependencies": "Abhängigkeiten", + "description": "Beschreibung", + "details": "Details", + "extension id": "Erweiterungsbezeichner", + "file extensions": "Dateierweiterungen", + "grammar": "Grammatik", + "install count": "Installationsanzahl", + "keyboard shortcuts": "&&Tastenkombinationen", + "language id": "ID", + "language name": "Name", + "languages": "Sprachen ({0})", + "license": "Lizenz", + "menuContexts": "Menükontexte", + "name": "Erweiterungsname", + "noChangelog": "Es ist kein Änderungsprotokoll verfügbar.", + "noContributions": "Keine Beiträge", + "noDependencies": "Keine Abhängigkeiten", + "noReadme": "Keine INFODATEI verfügbar.", + "publisher": "Name des Herausgebers", + "rating": "Bewertung", + "setting name": "Name", + "settings": "Einstellungen ({0})", + "snippets": "Codeausschnitte", + "themes": "Designs ({0})" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json new file mode 100644 index 00000000000..8d4e4592085 --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "close": "Schließen", + "neverShowAgain": "Nicht mehr anzeigen", + "reallyRecommended": "Es wird empfohlen, die Extension'{0}' zu installieren.", + "showRecommendations": "Empfehlungen anzeigen", + "workspaceRecommended": "Für diesen Arbeitsbereich sind Extensionempfehlungen verfügbar." +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json new file mode 100644 index 00000000000..02bf6767cb0 --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json @@ -0,0 +1,38 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "ConfigureWorkspaceRecommendations.noWorkspace": "Empfehlungen sind nur für einen Arbeitsbereichsordner verfügbar.", + "OpenExtensionsFile.failed": "Die Datei \"extensions.json\" kann nicht im Ordner \".vscode\" erstellt werden ({0}).", + "Uninstalling": "Wird deinstalliert", + "builtin": "Integriert", + "clearExtensionsInput": "Extensioneingabe löschen", + "configureWorkspaceRecommendedExtensions": "Empfohlene Erweiterungen konfigurieren (Arbeitsbereich)", + "disableAction": "Deaktivieren", + "disableAlwaysAction.label": "Deaktivieren", + "disableForWorkspaceAction": "Arbeitsbereich", + "disableForWorkspaceAction.label": "Deaktivieren (Arbeitsbereich)", + "disableGloballyAction": "Immer", + "enableAction": "Aktivieren", + "enableAlwaysAction.label": "Aktivieren", + "enableForWorkspaceAction": "Arbeitsbereich", + "enableForWorkspaceAction.label": "Aktivieren (Arbeitsbereich)", + "enableGloballyAction": "Immer", + "installAction": "Installieren", + "installExtensions": "Extensions installieren", + "installing": "Wird installiert.", + "postUninstallTooltip": "Zum Deaktivieren erneut laden", + "reloadAction": "Erneut laden", + "showDisabledExtensions": "Deaktivierte Erweiterungen anzeigen", + "showInstalledExtensions": "Installierte Extensions anzeigen", + "showOutdatedExtensions": "Veraltete Extensions anzeigen", + "showPopularExtensions": "Beliebte Extensions anzeigen", + "showRecommendedExtensions": "Empfohlene Extensions anzeigen", + "showWorkspaceRecommendedExtensions": "Für den Arbeitsbereich empfohlene Extensions anzeigen", + "toggleExtensionsViewlet": "Extensions anzeigen", + "uninstallAction": "Deinstallieren", + "updateAction": "Aktualisieren", + "updateAll": "Alle Extensions aktualisieren" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json new file mode 100644 index 00000000000..0b0f9f710c0 --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "manage": "Drücken Sie die EINGABETASTE, um Ihre Extensions zu verwalten.", + "noExtensionsToInstall": "Geben Sie einen Extensionnamen ein.", + "searchFor": "Drücken Sie die EINGABETASTE, um nach \"{0}\" in Marketplace zu suchen." +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json new file mode 100644 index 00000000000..44395f28e60 --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "app.extension.identifier.errorMessage": "Erwartetes Format: \"${publisher}.${name}\". Beispiel: \"vscode.csharp\".", + "app.extensions.json.recommendations": "Liste der Erweiterungsempfehlungen. Der Bezeichner einer Erweiterung lautet immer \"${publisher}.${name}\". Beispiel: \"vscode.csharp\".", + "app.extensions.json.title": "Erweiterungen" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json new file mode 100644 index 00000000000..d2cb0550504 --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionsInputName": "Extension: {0}" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json index 7e22569aeb4..759690f11c8 100644 --- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json @@ -4,49 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "ConfigureWorkspaceRecommendations.noWorkspace": "Empfehlungen sind nur für einen Arbeitsbereichsordner verfügbar.", - "OpenExtensionsFile.failed": "Die Datei \"extensions.json\" kann nicht im Ordner \".vscode\" erstellt werden ({0}).", - "Uninstalling": "Wird deinstalliert", - "builtin": "Integriert", - "clearExtensionsInput": "Extensioneingabe löschen", - "configureWorkspaceRecommendedExtensions": "Empfohlene Erweiterungen konfigurieren (Arbeitsbereich)", - "disableAction": "Deaktivieren", - "disableAll": "Alle deaktivieren", - "disableAllWorkspace": "Alle deaktivieren (Arbeitsbereich)", - "disableAlwaysAction.label": "Deaktivieren", - "disableForWorkspaceAction": "Arbeitsbereich", - "disableForWorkspaceAction.label": "Deaktivieren (Arbeitsbereich)", - "disableGloballyAction": "Immer", - "enableAction": "Aktivieren", - "enableAll": "Alle aktivieren", - "enableAllWorkspace": "Alle aktivieren (Arbeitsbereich)", - "enableAlwaysAction.label": "Aktivieren", - "enableForWorkspaceAction": "Arbeitsbereich", - "enableForWorkspaceAction.label": "Aktivieren (Arbeitsbereich)", - "enableGloballyAction": "Immer", - "installAction": "Installieren", - "installExtensions": "Extensions installieren", + "InstallVSIXAction.reloadNow": "Jetzt erneut laden", + "InstallVSIXAction.success": "Die Erweiterung wurde erfolgreich installiert. Führen Sie einen Neustart aus, um sie zu aktivieren.", "installVSIX": "Aus VSIX installieren...", - "installing": "Wird installiert.", - "openExtensionsFolder": "Extensionordner öffnen", - "postDisableMessage": "Möchten Sie dieses Fenster erneut laden, um die Erweiterung \"{0}\" zu deaktivieren?", - "postDisableTooltip": "Zum Deaktivieren erneut laden", - "postEnableMessage": "Möchten Sie dieses Fenster erneut laden, um die Erweiterung \"{0}\" zu aktivieren?", - "postEnableTooltip": "Zum Aktivieren erneut laden", - "postInstallMessage": "Möchten Sie dieses Fenster erneut laden, um die Erweiterung \"{0}\" zu aktivieren?", - "postInstallTooltip": "Zum Aktivieren erneut laden", - "postUninstallMessage": "Möchten Sie dieses Fenster erneut laden, um die Erweiterung \"{0}\" zu deaktivieren?", - "postUninstallTooltip": "Zum Deaktivieren erneut laden", - "reloadAction": "Erneut laden", - "reloadNow": "Jetzt erneut laden", - "showDisabledExtensions": "Deaktivierte Erweiterungen anzeigen", - "showInstalledExtensions": "Installierte Extensions anzeigen", - "showOutdatedExtensions": "Veraltete Extensions anzeigen", - "showPopularExtensions": "Beliebte Extensions anzeigen", - "showRecommendedExtensions": "Empfohlene Extensions anzeigen", - "showWorkspaceRecommendedExtensions": "Für den Arbeitsbereich empfohlene Extensions anzeigen", - "toggleExtensionsViewlet": "Extensions anzeigen", - "uninstallAction": "Deinstallieren", - "updateAction": "Aktualisieren", - "updateAll": "Alle Extensions aktualisieren" + "openExtensionsFolder": "Extensionordner öffnen" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json index 727c35e1814..8e33aa2bcc5 100644 --- a/i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json @@ -20,10 +20,11 @@ "files.exclude.when": "Zusätzliche Überprüfung der gleichgeordneten Elemente einer entsprechenden Datei. Verwenden Sie \"$(basename)\" als Variable für den entsprechenden Dateinamen.", "filesConfigurationTitle": "Dateien", "formatOnSave": "Hiermit wird eine Datei beim Speichern formatiert. Es muss ein Formatierer vorhanden sein, die Datei darf nicht automatisch gespeichert werden, und der Editor darf nicht geschlossen werden.", + "insertFinalNewline": "Bei Aktivierung wird beim Speichern einer Datei eine abschließende neue Zeile am Dateiende eingefügt.", "openEditorsVisible": "Die Anzahl der Editoren, die im Bereich \"Geöffnete Editoren\" angezeigt werden. Legen Sie diesen Wert auf 0 fest, um den Bereich auszublenden.", "showExplorerViewlet": "Explorer anzeigen", "textFileEditor": "Textdatei-Editor", - "trimTrailingWhitespace": "Wenn diese Option aktiviert ist, werden nachgestellte Leerzeichen beim Speichern einer Datei gekürzt.", + "trimTrailingWhitespace": "Bei Aktivierung werden nachgestellte Leerzeichen beim Speichern einer Datei gekürzt.", "view": "Anzeigen", "watcherExclude": "Konfigurieren Sie Globmuster von Dateipfaden, die aus der Dateiüberwachung ausgeschlossen werden sollen. Das Ändern dieser Einstellung erfordert einen Neustart. Wenn Ihr Code beim Starten viel CPU-Zeit benötigt, können Sie große Ordner ausschließen, um die Anfangslast zu verringern." } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/deu/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/html/browser/webview.i18n.json b/i18n/deu/src/vs/workbench/parts/html/browser/webview.i18n.json index 3c0f0a6b24b..62c53cd0661 100644 --- a/i18n/deu/src/vs/workbench/parts/html/browser/webview.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/html/browser/webview.i18n.json @@ -4,5 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "devtools.webview": "Developer: Webansichtstools" + "devtools.webview": "Developer: Webview-Tools" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json index 74991f2176f..e6c1811962d 100644 --- a/i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "errors.warnings.show.label": "Fehler und Warnungen", + "errors.warnings.show.label": "Fehler und Warnungen anzeigen", "markers.panel.action.filter": "Probleme filtern", "markers.panel.aria.label.problems.tree": "Probleme nach Dateien gruppiert", "markers.panel.at.ln.col.number": "({0}, {1})", @@ -25,15 +25,15 @@ "markers.panel.title.problems": "Probleme", "problems.panel.configuration.autoreveal": "Steuert, ob die Ansicht \"Probleme\" automatisch Dateien anzeigen sollte, wenn diese geöffnet werden.", "problems.panel.configuration.title": "Ansicht \"Probleme\"", - "problems.tree.aria.label.error.marker": "Von {0} generierter Fehler: {1} in Zeile {2} und Spalte {3}", - "problems.tree.aria.label.error.marker.nosource": "Fehler: {0} in Zeile {1} und Spalte {2}", - "problems.tree.aria.label.info.marker": "Von {0} generierte Informationen: {1} in Zeile {2} und Spalte {3}", - "problems.tree.aria.label.info.marker.nosource": "Informationen: {0} in Zeile {1} und Spalte {2}", - "problems.tree.aria.label.marker": "Von {0} generiertes Problem: {1} in Zeile {2} und Spalte {3}", - "problems.tree.aria.label.marker.nosource": "Problem: {0} in Zeile {1} und Spalte {2}", + "problems.tree.aria.label.error.marker": "Von \"{0}\" generierter Fehler: \"{1}\" in Zeile {2} bei Zeichen {3}", + "problems.tree.aria.label.error.marker.nosource": "Fehler: \"{0}\" in Zeile {1} bei Zeichen {2}", + "problems.tree.aria.label.info.marker": "Von \"{0}\" generierte Informationen: \"{1}\" in Zeile {2} bei Zeichen {3}", + "problems.tree.aria.label.info.marker.nosource": "Informationen: \"{0}\" in Zeile {1} bei Zeichen {2}", + "problems.tree.aria.label.marker": "Von \"{0}\" generiertes Problem: \"{1}\" in Zeile {2} bei Zeichen {3}", + "problems.tree.aria.label.marker.nosource": "Problem: \"{0}\" in Zeile {1} bei Zeichen {2}", "problems.tree.aria.label.resource": "{0} mit {1} Problemen", - "problems.tree.aria.label.warning.marker": "Von {0} generierte Warnung: {1} in Zeile {2} und Spalte {3}", - "problems.tree.aria.label.warning.marker.nosource": "Warnung: {0} in Zeile {1} und Spalte {2}", + "problems.tree.aria.label.warning.marker": "Von \"{0}\" generierte Warnung: \"{1}\" in Zeile {2} bei Zeichen {3}", + "problems.tree.aria.label.warning.marker.nosource": "Warnung: \"{0}\" in Zeile {1} bei Zeichen {2}", "problems.view.show.label": "Probleme anzeigen", "viewCategory": "Anzeigen" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json new file mode 100644 index 00000000000..8f1b785116e --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "neverAgain": "Nicht mehr anzeigen", + "remindLater": "Später erinnern", + "surveyQuestion": "Wir würden uns freuen, wenn Sie an einer schnellen Umfrage teilnehmen.", + "takeSurvey": "An Umfrage teilnehmen" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json index 937c64a154e..00230bfe732 100644 --- a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json @@ -25,12 +25,12 @@ "JsonSchema.options.cwd": "Das aktuelle Arbeitsverzeichnis des ausgeführten Programms oder Skripts. Wenn keine Angabe erfolgt, wird das aktuelle Arbeitsbereich-Stammverzeichnis des Codes verwendet.", "JsonSchema.options.env": "Die Umgebung des ausgeführten Programms oder der Shell. Wenn keine Angabe erfolgt, wird Umgebung des übergeordneten Prozesses verwendet.", "JsonSchema.pattern.code": "Der Übereinstimmungsgruppenindex des Codes des Problems. Der Standardwert ist undefiniert.", - "JsonSchema.pattern.column": "Der Übereinstimmungsgruppenindex der Spalte des Problems. Der Standardwert ist 3.", - "JsonSchema.pattern.endColumn": "Der Übereinstimmungsgruppenindex der Endspalte des Problems. Der Standardwert ist undefiniert.", + "JsonSchema.pattern.column": "Der Übereinstimmungsgruppenindex des Zeilenzeichens des Problems. Der Standardwert ist 3.", + "JsonSchema.pattern.endColumn": "Der Übereinstimmungsgruppenindex des Zeilenendezeichens des Problems. Der Standardwert ist undefiniert.", "JsonSchema.pattern.endLine": "Der Übereinstimmungsgruppenindex der Endzeile des Problems. Der Standardwert ist undefiniert.", "JsonSchema.pattern.file": "Der Übereinstimmungsgruppenindex des Dateinamens. Wenn keine Angabe erfolgt, wird 1 verwendet.", "JsonSchema.pattern.line": "Der Übereinstimmungsgruppenindex der Zeile des Problems. Der Standardwert ist 2.", - "JsonSchema.pattern.location": "Der Übereinstimmungsgruppenindex der Position des Problems. Gültige Positionsmuster: (line), (line,column) und (startLine,startColumn,endLine,endColumn). Wenn keine Angabe erfolgt, werden die Zeile und die Spalte verwendet.", + "JsonSchema.pattern.location": "Der Übereinstimmungsgruppenindex der Position des Problems. Gültige Positionsmuster: (line), (line,column) und (startLine,startColumn,endLine,endColumn). Wenn keine Angabe erfolgt, wird (line,column) angenommen.", "JsonSchema.pattern.loop": "Gibt in einer mehrzeiligen Abgleichschleife an, ob dieses Muster in einer Schleife ausgeführt wird, wenn es übereinstimmt. Kann nur für ein letztes Muster in einem mehrzeiligen Muster angegeben werden.", "JsonSchema.pattern.message": "Der Übereinstimmungsgruppenindex der Nachricht. Wenn keine Angabe erfolgt, ist der Standardwert 4, wenn die Position angegeben wird. Andernfalls ist der Standardwert 5.", "JsonSchema.pattern.regexp": "Der reguläre Ausdruck zum Ermitteln eines Fehlers, einer Warnung oder von Informationen in der Ausgabe.", @@ -69,7 +69,7 @@ "RunTaskAction.label": "Task ausführen", "ShowLogAction.label": "Taskprotokoll anzeigen", "TaskSystem.active": "Zurzeit ist ein aktiver Task vorhanden, der aktuell ausgeführt wird. Beenden Sie diesen, bevor Sie einen anderen Task ausführen.", - "TaskSystem.activeSame": "Der Task ist bereits aktiv und im Überwachungsmodus.", + "TaskSystem.activeSame": "Der Task ist bereits aktiv und im Überwachungsmodus. Um den Task zu beenden, verwenden Sie \"F1 > Task beenden\".", "TaskSystem.exitAnyways": "&&Trotzdem beenden", "TaskSystem.invalidTaskJson": "Fehler: Der Inhalt der Datei \"tasks.json\" weist Syntaxfehler auf. Bitte korrigieren sie diese, bevor Sie einen Task ausführen.\n", "TaskSystem.noBuildType": "Es ist keine gültige Taskausführung konfiguriert. Unterstützte Taskausführungen sind \"service\" und \"program\".", diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json index 1139a350827..1056bd02871 100644 --- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "terminal.integrated.copySelection.noSelection": "Die Terminalauswahl kann nicht kopiert werden, wenn das Terminal nicht den Fokus besitzt.", - "terminal.integrated.exitedWithCode": "Der Terminalprozess wurde mit folgendem Exitcode beendet: {0}" + "terminal.integrated.exitedWithCode": "Der Terminalprozess wurde mit folgendem Exitcode beendet: {0}", + "terminal.integrated.launchFailed": "Fehler beim Starten des Terminalprozessbefehls \"{0}{1}\" (Exitcode: {2})." } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/services/history/browser/history.i18n.json b/i18n/deu/src/vs/workbench/services/history/browser/history.i18n.json index 3b75619fa44..71313f5b9b4 100644 --- a/i18n/deu/src/vs/workbench/services/history/browser/history.i18n.json +++ b/i18n/deu/src/vs/workbench/services/history/browser/history.i18n.json @@ -5,7 +5,7 @@ // Do not edit this file. It is machine generated. { "devExtensionWindowTitle": "[Extensionentwicklungshost] – {0}", - "patchedWindowTitle": " [Nicht unterstützt]", + "patchedWindowTitle": "[Nicht unterstützt]", "prefixDecoration": "● {0}", "prefixTitle": "{0} - {1}", "prefixWorkspaceTitle": "{0} - {1} - {2}", diff --git a/i18n/deu/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/deu/src/vs/workbench/services/message/browser/messageList.i18n.json new file mode 100644 index 00000000000..0da16e1b0ad --- /dev/null +++ b/i18n/deu/src/vs/workbench/services/message/browser/messageList.i18n.json @@ -0,0 +1,14 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "alertErrorMessage": "Fehler: {0}", + "alertInfoMessage": "Info: {0}", + "alertWarningMessage": "Warnung: {0}", + "close": "Schließen", + "error": "Fehler", + "info": "Info", + "warning": "Warnung" +} \ No newline at end of file diff --git a/i18n/esn/extensions/typescript/package.i18n.json b/i18n/esn/extensions/typescript/package.i18n.json index e0d0817ec15..b3d3e526a36 100644 --- a/i18n/esn/extensions/typescript/package.i18n.json +++ b/i18n/esn/extensions/typescript/package.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "configuration.typescript": "TypeScript.", + "configuration.typescript": "TypeScript", "format.insertSpaceAfterCommaDelimiter": "Define el tratamiento del espacio después de un delimitador de coma.", "format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Define el tratamiento del espacio después de la palabra clave function para las funciones anónimas.", "format.insertSpaceAfterKeywordsInControlFlowStatements": "Define el tratamiento del espacio después de las palabras clave en una instrucción de flujo de control.", diff --git a/i18n/esn/src/vs/code/electron-main/menus.i18n.json b/i18n/esn/src/vs/code/electron-main/menus.i18n.json index ee9c4f92434..a9e0e93c719 100644 --- a/i18n/esn/src/vs/code/electron-main/menus.i18n.json +++ b/i18n/esn/src/vs/code/electron-main/menus.i18n.json @@ -46,6 +46,7 @@ "miGotoLine": "Ir a lí&&nea...", "miGotoSymbolInFile": "Ir al &&símbolo en el archivo...", "miGotoSymbolInWorkspace": "Ir al símbolo en el área de &&trabajo...", + "miHideActivityBar": "Ocultar &&barra de actividades", "miHideStatusbar": "&&Ocultar barra de estado", "miInstallingUpdate": "Instalando actualización...", "miIntroductoryVideos": "&&Vídeos de introducción", @@ -88,6 +89,7 @@ "miSelectAll": "&&Seleccionar todo", "miSelectColorTheme": "&&Tema de color", "miSelectIconTheme": "Tema de &&iconos de archivo", + "miShowActivityBar": "Mostrar &&barra de actividades", "miShowStatusbar": "&&Mostrar barra de estado", "miSplitEditor": "Dividir &&editor", "miSwitchEditor": "Cambiar &&editor", diff --git a/i18n/esn/src/vs/code/electron-main/windows.i18n.json b/i18n/esn/src/vs/code/electron-main/windows.i18n.json index 9f2ba56a80b..a54409334c3 100644 --- a/i18n/esn/src/vs/code/electron-main/windows.i18n.json +++ b/i18n/esn/src/vs/code/electron-main/windows.i18n.json @@ -10,10 +10,14 @@ "appStalled": "La ventana ha dejado de responder.", "appStalledDetail": "Puede volver a abrir la ventana, cerrarla o seguir esperando.", "close": "Cerrar", + "folderDesc": "{0} {1}", "hiddenMenuBar": "Para acceder a la barra de menús, también puede presionar la tecla **Alt**.", + "newWindow": "Nueva ventana", + "newWindowDesc": "Abre una ventana nueva.", "ok": "Aceptar", "pathNotExistDetail": "Parece que la ruta '{0}' ya no existe en el disco.", "pathNotExistTitle": "La ruta no existe", + "recentFolders": "Carpetas recientes", "reopen": "Volver a abrir", "wait": "Siga esperando" } \ No newline at end of file diff --git a/i18n/esn/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/esn/src/vs/editor/common/services/modelServiceImpl.i18n.json index e9630377f4b..4523474df5a 100644 --- a/i18n/esn/src/vs/editor/common/services/modelServiceImpl.i18n.json +++ b/i18n/esn/src/vs/editor/common/services/modelServiceImpl.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "diagAndSource": "[{0}] {1}", + "diagAndSourceMultiline": "[{0}]\n{1}", "indentAutoMigrate": "Actualice la configuración: `editor.detectIndentation` reemplaza a `editor.tabSize`: \"auto\" o `editor.insertSpaces`: \"auto\"" } \ No newline at end of file diff --git a/i18n/esn/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/esn/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json new file mode 100644 index 00000000000..7b30137c94f --- /dev/null +++ b/i18n/esn/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json @@ -0,0 +1,19 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "parseErrors": "Errores al analizar {0}: {1}", + "schema.autoClosingPairs": "Define el par de corchetes. Cuando se escribe un corchete de apertura, se inserta automáticamente el corchete de cierre.", + "schema.autoClosingPairs.notIn": "Define una lista de ámbitos donde los pares automáticos están deshabilitados.", + "schema.blockComment.begin": "Secuencia de caracteres que inicia un comentario de bloque.", + "schema.blockComment.end": "Secuencia de caracteres que finaliza un comentario de bloque.", + "schema.blockComments": "Define cómo se marcan los comentarios de bloque.", + "schema.brackets": "Define los corchetes que aumentan o reducen la sangría.", + "schema.closeBracket": "Secuencia de cadena o corchete de cierre.", + "schema.comments": "Define los símbolos de comentario", + "schema.lineComment": "Secuencia de caracteres que inicia un comentario de línea.", + "schema.openBracket": "Secuencia de cadena o corchete de apertura.", + "schema.surroundingPairs": "Define los pares de corchetes que se pueden usar para encerrar una cadena seleccionada." +} \ No newline at end of file diff --git a/i18n/esn/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/esn/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json new file mode 100644 index 00000000000..05c4885cc47 --- /dev/null +++ b/i18n/esn/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noWorkspace": "No hay ningún área de trabajo." +} \ No newline at end of file diff --git a/i18n/esn/src/vs/platform/request/node/request.i18n.json b/i18n/esn/src/vs/platform/request/node/request.i18n.json new file mode 100644 index 00000000000..ffcf6bc4a20 --- /dev/null +++ b/i18n/esn/src/vs/platform/request/node/request.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "httpConfigurationTitle": "HTTP", + "proxy": "El valor del proxy que se debe utilizar. Si no se establece, se tomará de las variables de entorno http_proxy y https_proxy", + "proxyAuthorization": "Valor que debe enviarse como encabezado de 'Proxy-Authorization' para cada solicitud de red.", + "strictSSL": "Indica si el certificado del servidor proxy debe comprobarse en la lista de entidades de certificación proporcionada." +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/esn/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json new file mode 100644 index 00000000000..85850904a87 --- /dev/null +++ b/i18n/esn/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider \"{0}\" no pudo proporcionar el nodo raíz.", + "treeExplorer.failedToResolveChildren": "TreeExplorerNodeProvider \"{0}\" no pudo resolver los elementos secundarios.", + "treeExplorer.notRegistered": "No hay registrado ningún TreeExplorerNodeProvider con el identificador \"{0}\"." +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/esn/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json new file mode 100644 index 00000000000..cbe01db99b0 --- /dev/null +++ b/i18n/esn/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionUnderDevelopment": "Cargando la extensión de desarrollo en {0}", + "overwritingExtension": "Sobrescribiendo la extensión {0} con {1}." +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json new file mode 100644 index 00000000000..615dc660474 --- /dev/null +++ b/i18n/esn/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "toggleActivityBar": "Alternar visibilidad de la barra de actividades", + "view": "Ver" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/panel/panelPart.i18n.json index 4dbb5eefe2d..74b45eab652 100644 --- a/i18n/esn/src/vs/workbench/browser/parts/panel/panelPart.i18n.json +++ b/i18n/esn/src/vs/workbench/browser/parts/panel/panelPart.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closePanel": "Cerrar", + "closePanel": "Cerrar panel", "focusPanel": "Centrarse en el panel", "toggleMaximizedPanel": "Alternar el panel maximizado", "togglePanel": "Alternar panel", diff --git a/i18n/esn/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json index 7b26e5ce6b8..c248a4c6483 100644 --- a/i18n/esn/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json +++ b/i18n/esn/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json @@ -13,5 +13,5 @@ "noResultsFound1": "No se encontraron resultados", "pickHistory": "Seleccione una entrada del editor para quitarla del historial", "quickOpenInput": "Escriba '?' para obtener ayuda con las acciones que puede realizar desde aquí", - "removeFromEditorHistory": "Quitar del historial de editores" + "removeFromEditorHistory": "Quitar del historial" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json index 37cfa3e19c8..7c1e01ca389 100644 --- a/i18n/esn/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json +++ b/i18n/esn/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json @@ -4,5 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "canNotRun": "El comando '{0}' no puede ejecutarse desde aquí." + "canNotRun": "El comando \"{0}\" no está habilitado actualmente y no se puede ejecutar." } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/extensionHost.i18n.json new file mode 100644 index 00000000000..9b096b7504a --- /dev/null +++ b/i18n/esn/src/vs/workbench/electron-browser/extensionHost.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionHostProcess.crash": "El host de extensiones finalizó inesperadamente. Recargue la ventana para recuperarlo.", + "extensionHostProcess.error": "Error del host de extensiones: {0}", + "extensionHostProcess.startupFail": "El host de extensiones no se inició en 10 segundos, lo cual puede ser un problema.", + "extensionHostProcess.startupFailDebug": "El host de extensiones no se inició en 10 segundos, puede que se detenga en la primera línea y necesita un depurador para continuar." +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/electron-browser/integration.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/integration.i18n.json index c38b4747f37..e2b59883e0d 100644 --- a/i18n/esn/src/vs/workbench/electron-browser/integration.i18n.json +++ b/i18n/esn/src/vs/workbench/electron-browser/integration.i18n.json @@ -6,10 +6,8 @@ { "copy": "Copiar", "cut": "Cortar", - "files": "archivos", - "folders": "carpetas", - "openRecentPlaceHolder": "Seleccione una ruta de acceso para abrir (mantenga presionada la tecla Ctrl para abrirla en una nueva ventana)", - "openRecentPlaceHolderMac": "Seleccione una ruta de acceso (mantenga presionada la tecla Cmd para abrirla en una nueva ventana)", + "developer": "Desarrollador", + "file": "Archivo", "paste": "Pegar", "redo": "Rehacer", "selectAll": "Seleccionar todo", diff --git a/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json index b70227e8ab2..b57ab2a2883 100644 --- a/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "activityBarVisibility": "Controla la visibilidad de la barra de actividades en el área de trabajo.", "closeOnFocusLost": "Controla si Quick Open debe cerrarse automáticamente cuando pierde el foco.", - "developer": "Desarrollador", "editorOpenPositioning": "Controla dónde se abren los editores. Seleccione 'izquierda' o 'derecha' para abrir los editores situados a la izquierda o la derecha del que está actualmente activo. Seleccione 'primero' o 'último' para abrir los editores con independencia del que esté actualmente activo.", "enablePreview": "Controla si los editores abiertos se muestran en vista previa. Los editores en vista previa se reutilizan hasta que se guardan (por ejemplo, mediante doble clic o editándolos).", "enablePreviewFromQuickOpen": "Controla si los editores abiertos mediante Quick Open se muestran en modo de vista previa. Los editores en modo de vista previa se reutilizan hasta que se conservan (por ejemplo, mediante doble clic o editándolos).", @@ -15,12 +15,13 @@ "openFilesInNewWindow": "Si está habilitado, los archivos se abrirán en una nueva ventana en lugar de volver a usar una instancia existente.", "reopenFolders": "Controla cómo se vuelven a abrir las carpetas tras un reinicio. Seleccione \"none\" para no volver a abrir jamás una carpeta, \"one\" para volver a abrir la última carpeta en la que trabajó o seleccione \"all\" para volver a abrir todas las carpetas de la última sesión.", "restoreFullscreen": "Controla si una ventana se debe restaurar al modo de pantalla completa si se salió de ella en dicho modo.", + "showEditorTabCloseButton": "Controla si las pestañas del editor deben tener un botón de cierre visible o no.", "showEditorTabs": "Controla si los editores abiertos se deben mostrar o no en pestañas.", + "showFullPath": "Si se habilita, mostrará la ruta de acceso completa de los archivos abiertos en el título de la ventana.", "showIcons": "Controla si los editores abiertos deben mostrarse o no con un icono. Requiere que también se habilite un tema de icono.", "sideBarLocation": "Controla la ubicación de la barra lateral. Puede mostrarse a la izquierda o a la derecha del área de trabajo.", "statusBarVisibility": "Controla la visibilidad de la barra de estado en la parte inferior del área de trabajo.", - "updateChannel": "Configure si recibirá actualizaciones automáticas de un canal de actualización. Es necesario reiniciar tras el cambio.", - "updateConfigurationTitle": "Actualización", + "titleBarStyle": "Ajuste la apariencia de la barra de título de la ventana. Se debe realizar un reinicio completo para aplicar los cambios.", "view": "Ver", "windowConfigurationTitle": "Ventana", "workbenchConfigurationTitle": "Área de trabajo", diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json index 63dfd895c6d..b6237f4e909 100644 --- a/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json @@ -10,18 +10,16 @@ "addToWatchExpressions": "Agregar a inspección", "addWatchExpression": "Agregar expresión", "clearRepl": "Borrar consola", - "conditionalBreakpointEditorAction": "Depuración: agregar punto de interrupción condicional...", "continueDebug": "Continuar", "deactivateBreakpoints": "Desactivar puntos de interrupción", - "debugAddToWatch": "Depuración: Agregar a inspección", "debugConsoleAction": "Consola de depuración", - "debugEvaluate": "Depuración: Evaluar", "debugFocusConsole": "Enfocar consola de depuración", "disableAllBreakpoints": "Deshabilitar todos los puntos de interrupción", "disconnectDebug": "Desconectar", "editConditionalBreakpoint": "Editar punto de interrupción...", "editWatchExpression": "Editar expresión", "enableAllBreakpoints": "Habilitar todos los puntos de interrupción", + "focusProcess": "Proceso Foco", "launchJsonNeedsConfigurtion": "Configurar o reparar 'launch.json'", "openLaunchJson": "Abrir {0}", "pauseDebug": "Pausar", @@ -34,10 +32,9 @@ "renameFunctionBreakpoint": "Cambiar nombre de punto de interrupción de función", "restartDebug": "Reiniciar", "restartFrame": "Reiniciar marco", - "runToCursor": "Depuración: Ejecutar hasta el cursor", + "reverseContinue": "Invertir", "selectConfig": "Seleccionar configuración", "setValue": "Establecer valor", - "showDebugHover": "Depuración: Mostrar al mantener el puntero", "startDebug": "Iniciar depuración", "startWithoutDebugging": "Iniciar sin depurar", "stepBackDebug": "Retroceder", @@ -45,7 +42,6 @@ "stepOutDebug": "Salir de la depuración", "stepOverDebug": "Depurar paso a paso por procedimientos", "stopDebug": "Detener", - "toggleBreakpointAction": "Depuración: Alternar punto de interrupción", "toggleEnablement": "Habilitar/Deshabilitar punto de interrupción", "unreadOutput": "Nueva salida en la consola de depuración" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json new file mode 100644 index 00000000000..60d0d99c0dc --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json @@ -0,0 +1,13 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "conditionalBreakpointEditorAction": "Depuración: agregar punto de interrupción condicional...", + "debugAddToWatch": "Depuración: Agregar a inspección", + "debugEvaluate": "Depuración: Evaluar", + "runToCursor": "Depuración: Ejecutar hasta el cursor", + "showDebugHover": "Depuración: Mostrar al mantener el puntero", + "toggleBreakpointAction": "Depuración: Alternar punto de interrupción" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/common/debug.i18n.json new file mode 100644 index 00000000000..899d48ca9d6 --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/debug/common/debug.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noConfigurations": "No hay configuraciones." +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json index 64f88ff9aaf..7a136924fa1 100644 --- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json @@ -11,9 +11,10 @@ "functionBreakpointPlaceholder": "Función donde interrumpir", "functionBreakpointsNotSupported": "Este tipo de depuración no admite puntos de interrupción en funciones", "loadMoreStackFrames": "Cargar más marcos de pila", - "paused": "en pausa", + "paused": "En pausa", + "pausedOn": "En pausa en {0}", "process": "Proceso", - "running": "en ejecución", + "running": "En ejecución", "stackFrameAriaLabel": "Marco de pila {0} línea {1} {2}, pila de llamadas, depuración", "thread": "Subproceso", "threadAriaLabel": "Subproceso {0}, pila de llamadas, depuración", diff --git a/i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json index 914679b06cb..6e08d6a9ff9 100644 --- a/i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debugConfigurationNames": "Configuraciones que se iniciarán como parte de esta configuración \"compuesta\". Solo se respeta si el tipo de configuración es \"compuesta\".", "debugLinuxConfiguration": "Atributos de configuración de inicio específicos de Linux.", "debugName": "Nombre de la configuración. Aparece en el menú desplegable de la configuración de inicio.", "debugOSXConfiguration": "Atributos de configuración de inicio específicos de OS X.", "debugPrelaunchTask": "Tarea que se va a ejecutar antes de iniciarse la sesión de depuración.", "debugRequest": "Tipo de solicitud de la configuración. Puede ser \"launch\" o \"attach\".", + "debugServer": "Solo para el desarrollo de extensiones de depuración: si se especifica un puerto, VS Code intenta conectarse a un adaptador de depuración que se ejecuta en modo servidor", "debugType": "Tipo de configuración.", "debugWindowsConfiguration": "Atributos de configuración de inicio específicos de Windows.", "internalConsoleOptions": "Controla el comportamiento de la consola de depuración interna.", diff --git a/i18n/esn/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json index 36c4b0835a9..94b4b5fbd0a 100644 --- a/i18n/esn/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json @@ -6,6 +6,7 @@ { "DebugConfig.failed": "No se puede crear el archivo \"launch.json\" dentro de la carpeta \".vscode\" ({0}).", "app.launch.json.configurations": "Lista de configuraciones. Agregue configuraciones nuevas o edite las ya existentes con IntelliSense.", + "app.launch.json.debugServer": "EN DESUSO: mueva debugServer dentro de una configuración.", "app.launch.json.title": "Iniciar", "app.launch.json.version": "Versión de este formato de archivo.", "debugNoType": "El valor \"type\" del adaptador de depuración no se puede omitir y debe ser de tipo \"string\".", diff --git a/i18n/esn/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json b/i18n/esn/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json new file mode 100644 index 00000000000..0de2a1a20fd --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.noMatchingProviderId": "No hay registrado ningún TreeExplorerNodeProvider con el identificador {providerId}." +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json new file mode 100644 index 00000000000..25c662bc788 --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.invalidId": "La extensión de explorador de árbol {0} tiene un identificador no válido y no se puedo activar.", + "vscode.extension.contributes.explorer.icon": "Ruta de acceso al icono de viewlet en la barra de actividades", + "vscode.extension.contributes.explorer.treeExplorerNodeProviderId": "Identificador único usado para identificar el proveedor registrado a través de vscode.workspace.registerTreeExplorerNodeProvider", + "vscode.extension.contributes.explorer.treeLabel": "Cadena en lenguaje natural usada para representar el explorador de árbol personalizado" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json new file mode 100644 index 00000000000..ba7a3af705b --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "disable": "Deshabilitar", + "enable": "Habilitar", + "treeExplorer.toggle": "Alternar el explorador personalizado", + "view": "Ver" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json new file mode 100644 index 00000000000..a0ef846bf72 --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "refresh": "Actualizar" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/esn/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json new file mode 100644 index 00000000000..24ff8b1da9c --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorerViewlet.tree": "Sección de explorador de árbol" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json new file mode 100644 index 00000000000..ba43a57513b --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "Unknown Dependency": "Dependencia desconocida:", + "error": "Error" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json new file mode 100644 index 00000000000..3c0bc656ef6 --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json @@ -0,0 +1,39 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "JSON Validation": "Validación JSON ({0})", + "changelog": "Registro de cambios", + "command name": "Nombre", + "commands": "Comandos ({0})", + "contributions": "Contribuciones", + "debugger name": "Nombre", + "debuggers": "Depuradores ({0})", + "default": "Predeterminado", + "dependencies": "Dependencias", + "description": "Descripción", + "details": "Detalles", + "extension id": "Identificador de la extensión", + "file extensions": "Extensiones de archivo", + "grammar": "Gramática", + "install count": "Número de instalaciones", + "keyboard shortcuts": "&&Métodos abreviados de teclado", + "language id": "Id.", + "language name": "Nombre", + "languages": "Lenguajes ({0})", + "license": "Licencia", + "menuContexts": "Contextos de menú", + "name": "Nombre de la extensión", + "noChangelog": "No hay ningún objeto CHANGELOG disponible.", + "noContributions": "No hay contribuciones.", + "noDependencies": "No hay dependencias.", + "noReadme": "No hay ningún archivo LÉAME disponible.", + "publisher": "Nombre del editor", + "rating": "Clasificación", + "setting name": "Nombre", + "settings": "Configuración ({0})", + "snippets": "Fragmentos", + "themes": "Temas ({0})" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json new file mode 100644 index 00000000000..af1c8b9a00f --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "close": "Cerrar", + "neverShowAgain": "No volver a mostrar", + "reallyRecommended": "Se recomienda instalar la extensión '{0}'.", + "showRecommendations": "Mostrar recomendaciones", + "workspaceRecommended": "Esta área de trabajo tiene recomendaciones de extensión." +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json new file mode 100644 index 00000000000..26399849b40 --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json @@ -0,0 +1,38 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "ConfigureWorkspaceRecommendations.noWorkspace": "Las recomendaciones solo están disponibles en una carpeta de área de trabajo.", + "OpenExtensionsFile.failed": "No se puede crear el archivo \"extensions.json\" dentro de la carpeta \".vscode\" ({0}).", + "Uninstalling": "Desinstalando", + "builtin": "Integrada", + "clearExtensionsInput": "Borrar entrada de extensiones", + "configureWorkspaceRecommendedExtensions": "Configurar extensiones recomendadas (área de trabajo)", + "disableAction": "Deshabilitar", + "disableAlwaysAction.label": "Deshabilitar", + "disableForWorkspaceAction": "Área de trabajo", + "disableForWorkspaceAction.label": "Deshabilitar (área de trabajo)", + "disableGloballyAction": "Siempre", + "enableAction": "Habilitar", + "enableAlwaysAction.label": "Habilitar", + "enableForWorkspaceAction": "Área de trabajo", + "enableForWorkspaceAction.label": "Habilitar (área de trabajo)", + "enableGloballyAction": "Siempre", + "installAction": "Instalar", + "installExtensions": "Instalar extensiones", + "installing": "Instalando", + "postUninstallTooltip": "Recargar para desactivar", + "reloadAction": "Recargar", + "showDisabledExtensions": "Mostrar extensiones deshabilitadas", + "showInstalledExtensions": "Mostrar extensiones instaladas", + "showOutdatedExtensions": "Mostrar extensiones obsoletas", + "showPopularExtensions": "Mostrar extensiones conocidas", + "showRecommendedExtensions": "Mostrar extensiones recomendadas", + "showWorkspaceRecommendedExtensions": "Mostrar extensiones recomendadas del área de trabajo", + "toggleExtensionsViewlet": "Mostrar extensiones", + "uninstallAction": "Desinstalar", + "updateAction": "Actualizar", + "updateAll": "Actualizar todas las extensiones" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json new file mode 100644 index 00000000000..8de7288e8f4 --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "manage": "Presione ENTRAR para administrar sus extensiones.", + "noExtensionsToInstall": "Escriba un nombre de extensión", + "searchFor": "Presione ENTRAR para buscar '{0}' en el catálogo de soluciones." +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json new file mode 100644 index 00000000000..af09009b5fb --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "app.extension.identifier.errorMessage": "Se esperaba el formato '${publisher}.${name}'. Ejemplo: 'vscode.csharp'.", + "app.extensions.json.recommendations": "Lista de recomendaciones de extensiones. El identificador de una extensión es siempre '${publisher}.${name}'. Por ejemplo: 'vscode.csharp'.", + "app.extensions.json.title": "Extensiones" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json new file mode 100644 index 00000000000..eb4330e8bd0 --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionsInputName": "Extensión: {0}" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json index f8638e5be73..48c909550e4 100644 --- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json @@ -4,49 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "ConfigureWorkspaceRecommendations.noWorkspace": "Las recomendaciones solo están disponibles en una carpeta de área de trabajo.", - "OpenExtensionsFile.failed": "No se puede crear el archivo \"extensions.json\" dentro de la carpeta \".vscode\" ({0}).", - "Uninstalling": "Desinstalando", - "builtin": "Integrada", - "clearExtensionsInput": "Borrar entrada de extensiones", - "configureWorkspaceRecommendedExtensions": "Configurar extensiones recomendadas (área de trabajo)", - "disableAction": "Deshabilitar", - "disableAll": "Deshabilitar todo", - "disableAllWorkspace": "Deshabilitar todo (área de trabajo)", - "disableAlwaysAction.label": "Deshabilitar", - "disableForWorkspaceAction": "Área de trabajo", - "disableForWorkspaceAction.label": "Deshabilitar (área de trabajo)", - "disableGloballyAction": "Siempre", - "enableAction": "Habilitar", - "enableAll": "Habilitar todo", - "enableAllWorkspace": "Habilitar todo (área de trabajo)", - "enableAlwaysAction.label": "Habilitar", - "enableForWorkspaceAction": "Área de trabajo", - "enableForWorkspaceAction.label": "Habilitar (área de trabajo)", - "enableGloballyAction": "Siempre", - "installAction": "Instalar", - "installExtensions": "Instalar extensiones", + "InstallVSIXAction.reloadNow": "Recargar ahora", + "InstallVSIXAction.success": "La extensión se instaló correctamente. Reinicie para habilitarla.", "installVSIX": "Instalar desde VSIX...", - "installing": "Instalando", - "openExtensionsFolder": "Abrir carpeta de extensiones", - "postDisableMessage": "¿Quiere recargar esta ventana para deshabilitar la extensión '{0}'?", - "postDisableTooltip": "Recargar para deshabilitar", - "postEnableMessage": "¿Quiere recargar esta ventana para habilitar la extensión '{0}'?", - "postEnableTooltip": "Recargar para habilitar", - "postInstallMessage": "¿Quiere recargar esta ventana para activar la extensión '{0}'?", - "postInstallTooltip": "Recargar para activar", - "postUninstallMessage": "¿Quiere recargar esta ventana para desactivar la extensión '{0}'?", - "postUninstallTooltip": "Recargar para desactivar", - "reloadAction": "Recargar", - "reloadNow": "Recargar ahora", - "showDisabledExtensions": "Mostrar extensiones deshabilitadas", - "showInstalledExtensions": "Mostrar extensiones instaladas", - "showOutdatedExtensions": "Mostrar extensiones obsoletas", - "showPopularExtensions": "Mostrar extensiones conocidas", - "showRecommendedExtensions": "Mostrar extensiones recomendadas", - "showWorkspaceRecommendedExtensions": "Mostrar extensiones recomendadas del área de trabajo", - "toggleExtensionsViewlet": "Mostrar extensiones", - "uninstallAction": "Desinstalar", - "updateAction": "Actualizar", - "updateAll": "Actualizar todas las extensiones" + "openExtensionsFolder": "Abrir carpeta de extensiones" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json index 0d51356e146..d5a9aeea1dd 100644 --- a/i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json @@ -20,10 +20,11 @@ "files.exclude.when": "Comprobación adicional de los elementos del mismo nivel de un archivo coincidente. Use $(nombreBase) como variable para el nombre de archivo que coincide.", "filesConfigurationTitle": "Archivos", "formatOnSave": "Formatea un archivo al guardarlo. Debe haber un formateador disponible, el archivo no debe guardarse automáticamente y el editor no debe estar cerrándose.", + "insertFinalNewline": "Si se habilita, inserte una nueva línea final al final del archivo cuando lo guarde.", "openEditorsVisible": "Número de editores mostrados en el panel Editores abiertos. Establezca este valor en 0 para ocultar el panel.", "showExplorerViewlet": "Mostrar explorador", "textFileEditor": "Editor de archivos de texto", - "trimTrailingWhitespace": "Si está habilitado, se recortará el espacio final cuando guarde un archivo.", + "trimTrailingWhitespace": "Si se habilita, se recortará el espacio final cuando se guarde un archivo.", "view": "Ver", "watcherExclude": "Configure patrones globales de las rutas de acceso de archivo que se van a excluir de la inspección de archivos. Al cambiar esta configuración, es necesario reiniciar. Si observa que Code consume mucho tiempo de CPU al iniciarse, puede excluir las carpetas grandes para reducir la carga inicial." } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/esn/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/html/browser/webview.i18n.json b/i18n/esn/src/vs/workbench/parts/html/browser/webview.i18n.json index 9b182aaf248..fb46f7bfaa7 100644 --- a/i18n/esn/src/vs/workbench/parts/html/browser/webview.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/html/browser/webview.i18n.json @@ -4,5 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "devtools.webview": "Desarrollador: Herramientas de vista web" + "devtools.webview": "Desarrollador: Herramientas Webview" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json index 9561eca3fc0..d367f8471dc 100644 --- a/i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "errors.warnings.show.label": "Errores y advertencias", + "errors.warnings.show.label": "Mostrar errores y advertencias", "markers.panel.action.filter": "Filtrar problemas", "markers.panel.aria.label.problems.tree": "Problemas agrupados por archivos", "markers.panel.at.ln.col.number": "({0}, {1})", @@ -25,15 +25,15 @@ "markers.panel.title.problems": "Problemas", "problems.panel.configuration.autoreveal": "Controla si la vista Problemas debe revelar automáticamente los archivos cuando los abre", "problems.panel.configuration.title": "Vista Problemas", - "problems.tree.aria.label.error.marker": "Se generó un error en {0}: {1} en la línea {2} y la columna {3}", - "problems.tree.aria.label.error.marker.nosource": "Error: {0} en la línea {1} y la columna {2}", - "problems.tree.aria.label.info.marker": "Se generó información en {0}: {1} en la línea {2} y la columna {3}", - "problems.tree.aria.label.info.marker.nosource": "Información: {0} en la línea {1} y la columna {2}", - "problems.tree.aria.label.marker": "Se generó un problema en {0}: {1} en la línea {2} y la columna {3}", - "problems.tree.aria.label.marker.nosource": "Problema: {0} en la línea {1} y la columna {2}", + "problems.tree.aria.label.error.marker": "Se generó un error en {0}: {1} en la línea {2} y el carácter {3}", + "problems.tree.aria.label.error.marker.nosource": "Error: {0} en la línea {1} y el carácter {2}", + "problems.tree.aria.label.info.marker": "Se generó información en {0}: {1} en la línea {2} y el carácter {3}", + "problems.tree.aria.label.info.marker.nosource": "Información: {0} en la línea {1} y el carácter {2}", + "problems.tree.aria.label.marker": "Se generó un problema en {0}: {1} en la línea {2} y el carácter {3}", + "problems.tree.aria.label.marker.nosource": "Problema: {0} en la línea {1} y el carácter{2}", "problems.tree.aria.label.resource": "{0} con {1} problemas", - "problems.tree.aria.label.warning.marker": "Se generó una advertencia en {0}: {1} en la línea {2} y la columna {3}", - "problems.tree.aria.label.warning.marker.nosource": "Advertencia: {0} en la línea {1} y la columna {2}", + "problems.tree.aria.label.warning.marker": "Se generó una advertencia en {0}: {1} en la línea {2} y el carácter {3}", + "problems.tree.aria.label.warning.marker.nosource": "Advertencia: {0} en la línea {1} y el carácter {2}", "problems.view.show.label": "Mostrar problemas", "viewCategory": "Ver" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json new file mode 100644 index 00000000000..9771d35f466 --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "neverAgain": "No volver a mostrar", + "remindLater": "Recordármelo más tarde", + "surveyQuestion": "¿Le importaría realizar una breve encuesta de opinión?", + "takeSurvey": "Realizar encuesta" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json index c3055f0a937..1329a69d10f 100644 --- a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json @@ -25,12 +25,12 @@ "JsonSchema.options.cwd": "Directorio de trabajo actual del script o el programa ejecutado. Si se omite, se usa la raíz del área de trabajo actual de Code.", "JsonSchema.options.env": "Entorno del shell o el programa ejecutado. Si se omite, se usa el entorno del proceso primario.", "JsonSchema.pattern.code": "Índice de grupo de coincidencias del código del problema. Valor predeterminado como no definido.", - "JsonSchema.pattern.column": "Índice de grupo de coincidencias de la columna del problema. Valor predeterminado: 3.", - "JsonSchema.pattern.endColumn": "Índice de grupo de coincidencias de la columna final del problema. Valor predeterminado como no definido.", + "JsonSchema.pattern.column": "Índice de grupo de coincidencias del carácter de línea del problema. Valor predeterminado: 3", + "JsonSchema.pattern.endColumn": "Índice de grupo de coincidencias del carácter de línea final del problema. Valor predeterminado como no definido", "JsonSchema.pattern.endLine": "Índice de grupo de coincidencias de la línea final del problema. Valor predeterminado como no definido.", "JsonSchema.pattern.file": "Índice de grupo de coincidencias del nombre de archivo. Si se omite, se usa 1.", "JsonSchema.pattern.line": "Índice de grupo de coincidencias de la línea del problema. Valor predeterminado: 2.", - "JsonSchema.pattern.location": "Índice de grupo de coincidencias de la ubicación del problema. Los patrones de ubicación válidos son: (line), (line,column) y (startLine,startColumn,endLine,endColumn). Si se omite, se asume el uso de \"line\" y \"column\".", + "JsonSchema.pattern.location": "Índice de grupo de coincidencias de la ubicación del problema. Los patrones de ubicación válidos son: (line), (line,column) y (startLine,startColumn,endLine,endColumn). Si se omite, se asume el uso de (line,column).", "JsonSchema.pattern.loop": "En un bucle de buscador de coincidencias multilínea, indica si este patrón se ejecuta en un bucle siempre que haya coincidencias. Solo puede especificarse en el último patrón de un patrón multilínea.", "JsonSchema.pattern.message": "Índice de grupo de coincidencias del mensaje. Si se omite, el valor predeterminado es 4 en caso de definirse la ubicación. De lo contrario, el valor predeterminado es 5.", "JsonSchema.pattern.regexp": "Expresión regular para encontrar un error, una advertencia o información en la salida.", @@ -69,7 +69,7 @@ "RunTaskAction.label": "Ejecutar tarea", "ShowLogAction.label": "Mostrar registro de tareas", "TaskSystem.active": "Hay una tarea en ejecución activa en este momento. Finalícela antes de ejecutar otra tarea.", - "TaskSystem.activeSame": "La tarea ya está activa y en modo de inspección.", + "TaskSystem.activeSame": "La tarea ya está activa y en modo de inspección. Para finalizar la tarea, use \"F1 > finalizar tarea\"", "TaskSystem.exitAnyways": "&&Salir de todos modos", "TaskSystem.invalidTaskJson": "Error: El contenido del archivo tasks.json tiene errores de sintaxis. Corríjalos antes de ejecutar una tarea.\n", "TaskSystem.noBuildType": "No se ha configurado un ejecutador de tareas válido. Los ejecutadores de tareas compatibles son \"service\" y \"program\".", diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json index fa01474b561..f22ca7838fe 100644 --- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "terminal.integrated.copySelection.noSelection": "No se puede copiar la selección del terminal cuando el terminal no tiene el foco", - "terminal.integrated.exitedWithCode": "El proceso del terminal finalizó con el código de salida: {0}" + "terminal.integrated.exitedWithCode": "El proceso del terminal finalizó con el código de salida: {0}", + "terminal.integrated.launchFailed": "No se pudo iniciar el comando de proceso terminal \"{0}{1}\" (código de salida: 2})" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/esn/src/vs/workbench/services/message/browser/messageList.i18n.json new file mode 100644 index 00000000000..878189c0d55 --- /dev/null +++ b/i18n/esn/src/vs/workbench/services/message/browser/messageList.i18n.json @@ -0,0 +1,14 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "alertErrorMessage": "Error: {0}", + "alertInfoMessage": "Información: {0}", + "alertWarningMessage": "Advertencia: {0}", + "close": "Cerrar", + "error": "Error", + "info": "Información", + "warning": "Advertencia" +} \ No newline at end of file diff --git a/i18n/fra/extensions/typescript/out/typescriptServiceClient.i18n.json b/i18n/fra/extensions/typescript/out/typescriptServiceClient.i18n.json index daf26cea778..7339a673340 100644 --- a/i18n/fra/extensions/typescript/out/typescriptServiceClient.i18n.json +++ b/i18n/fra/extensions/typescript/out/typescriptServiceClient.i18n.json @@ -6,9 +6,7 @@ { "channelName": "TypeScript", "close": "Fermer", - "doNotCheckAgain": "Ne plus vérifier", - "localTSFound": "Le dossier d'espace de travail contient TypeScript version {0}. Voulez-vous utiliser cette version à la place de la version d'ensemble {1} ?", - "moreInformation": "Informations", + "localTSFound": "Le dossier d'espace de travail contient TypeScript version {0}. Voulez-vous utiliser cette version à la place de la version groupée {1} ?", "neverCheckLocalVesion": "Ne jamais vérifier la version de l'espace de travail", "noServerFound": "Le chemin {0} ne pointe pas vers une installation valide de tsserver. Les fonctionnalités du langage TypeScript vont être désactivées.", "serverCouldNotBeStarted": "Impossible de démarrer le serveur de langage TypeScript. Message d'erreur : {0}", @@ -16,10 +14,8 @@ "serverDiedAfterStart": "Le service de langage TypeScript s'est subitement arrêté 5 fois juste après le démarrage et ne sera pas redémarré. Ouvrez un rapport de bogues.", "updateGlobalWorkspaceCheck": "Mise à jour du paramètre utilisateur 'typescript.check.workspaceVersion' avec la valeur false", "updateLocalWorkspaceCheck": "Mise à jour du paramètre d'espace de travail 'typescript.check.workspaceVersion' avec la valeur false", - "updateTscCheck": "Mise à jour du paramètre utilisateur 'typescript.check.tscVersion' avec la valeur false", "updatedtsdk": "Mise à jour du paramètre d'espace de travail 'typescript.tsdk' avec la valeur {0}", "use": "Utiliser l'espace de travail ({0})", "useBundled": "Utiliser l'ensemble d'applications ({0})", - "versionMismatch": "Incompatibilité de version ! global tsc ({0}) != Service de langage de VS Code ({1}). Des erreurs de compilation incohérentes risquent de se produire", "versionNumber.custom": "personnalisé" } \ No newline at end of file diff --git a/i18n/fra/extensions/typescript/package.i18n.json b/i18n/fra/extensions/typescript/package.i18n.json index 8e0c6424dfb..ae80070cc6e 100644 --- a/i18n/fra/extensions/typescript/package.i18n.json +++ b/i18n/fra/extensions/typescript/package.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "configuration.typescript": "TypeScript.", + "configuration.typescript": "TypeScript", "format.insertSpaceAfterCommaDelimiter": "Définit le traitement des espaces après une virgule de délimitation.", "format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Définit le traitement des espaces après le mot clé function pour les fonctions anonymes.", "format.insertSpaceAfterKeywordsInControlFlowStatements": "Définit le traitement des espaces après des mots clés dans une instruction de flux de contrôle.", diff --git a/i18n/fra/src/vs/code/electron-main/menus.i18n.json b/i18n/fra/src/vs/code/electron-main/menus.i18n.json index e700f5666de..d7dcd9cc719 100644 --- a/i18n/fra/src/vs/code/electron-main/menus.i18n.json +++ b/i18n/fra/src/vs/code/electron-main/menus.i18n.json @@ -46,6 +46,7 @@ "miGotoLine": "Atteindre la &&ligne...", "miGotoSymbolInFile": "Atteindre le &&symbole dans le fichier...", "miGotoSymbolInWorkspace": "Accéder au symbole dans l'espace de tra&&vail...", + "miHideActivityBar": "Masquer la &&Barre d'activités", "miHideStatusbar": "&&Masquer la barre d'état", "miInstallingUpdate": "Installation de la mise à jour...", "miIntroductoryVideos": "&&Vidéos d'introduction", @@ -88,6 +89,7 @@ "miSelectAll": "&&Sélectionner tout", "miSelectColorTheme": "Thème de &&couleur", "miSelectIconTheme": "Thème d'&&icône de fichier", + "miShowActivityBar": "Afficher la &&Barre d'activités", "miShowStatusbar": "Affic&&her la barre d'état", "miSplitEditor": "Fractionner l'édit&&eur", "miSwitchEditor": "Changer d'é&&diteur", diff --git a/i18n/fra/src/vs/code/electron-main/windows.i18n.json b/i18n/fra/src/vs/code/electron-main/windows.i18n.json index b0a79663701..e85bbdc90e5 100644 --- a/i18n/fra/src/vs/code/electron-main/windows.i18n.json +++ b/i18n/fra/src/vs/code/electron-main/windows.i18n.json @@ -10,10 +10,14 @@ "appStalled": "La fenêtre ne répond plus", "appStalledDetail": "Vous pouvez rouvrir ou fermer la fenêtre, ou continuer à patienter.", "close": "Fermer", + "folderDesc": "{0} {1}", "hiddenMenuBar": "Vous pouvez toujours accéder à la barre de menus en appuyant sur la touche **Alt**.", + "newWindow": "Nouvelle fenêtre", + "newWindowDesc": "Ouvre une nouvelle fenêtre", "ok": "OK", "pathNotExistDetail": "Le chemin d'accès '{0}' ne semble plus exister sur le disque.", "pathNotExistTitle": "Le chemin d'accès n'existe pas", + "recentFolders": "Dossiers récents", "reopen": "Rouvrir", "wait": "Continuer à attendre" } \ No newline at end of file diff --git a/i18n/fra/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/fra/src/vs/editor/common/services/modelServiceImpl.i18n.json index 200b08508a8..5048cfb3c31 100644 --- a/i18n/fra/src/vs/editor/common/services/modelServiceImpl.i18n.json +++ b/i18n/fra/src/vs/editor/common/services/modelServiceImpl.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "diagAndSource": "[{0}] {1}", + "diagAndSourceMultiline": "[{0}]\n{1}", "indentAutoMigrate": "Mettez à jour vos paramètres : 'editor.detectIndentation' remplace 'editor.tabSize': \"auto\" ou 'editor.insertSpaces': \"auto\"" } \ No newline at end of file diff --git a/i18n/fra/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/fra/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json new file mode 100644 index 00000000000..12a2b2ac42f --- /dev/null +++ b/i18n/fra/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json @@ -0,0 +1,19 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "parseErrors": "Erreurs durant l'analyse de {0} : {1}", + "schema.autoClosingPairs": "Définit les paires de crochets. Quand vous entrez un crochet ouvrant, le crochet fermant est inséré automatiquement.", + "schema.autoClosingPairs.notIn": "Définit une liste d'étendues où les paires automatiques sont désactivées.", + "schema.blockComment.begin": "Séquence de caractères au début d'un commentaire de bloc.", + "schema.blockComment.end": "Séquence de caractères à la fin d'un commentaire de bloc.", + "schema.blockComments": "Définit le marquage des commentaires de bloc.", + "schema.brackets": "Définit les symboles de type crochet qui augmentent ou diminuent le retrait.", + "schema.closeBracket": "Séquence de chaînes ou de caractères de crochets fermants.", + "schema.comments": "Définit les symboles de commentaire", + "schema.lineComment": "Séquence de caractères au début d'un commentaire de ligne.", + "schema.openBracket": "Séquence de chaînes ou de caractères de crochets ouvrants.", + "schema.surroundingPairs": "Définit les paires de crochets qui peuvent être utilisées pour entourer la chaîne sélectionnée." +} \ No newline at end of file diff --git a/i18n/fra/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/fra/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json new file mode 100644 index 00000000000..c3172333ef7 --- /dev/null +++ b/i18n/fra/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noWorkspace": "Aucun espace de travail." +} \ No newline at end of file diff --git a/i18n/fra/src/vs/platform/request/node/request.i18n.json b/i18n/fra/src/vs/platform/request/node/request.i18n.json new file mode 100644 index 00000000000..0c9c1cc229f --- /dev/null +++ b/i18n/fra/src/vs/platform/request/node/request.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "httpConfigurationTitle": "HTTP", + "proxy": "Paramètre de proxy à utiliser. S'il n'est pas défini, il est récupéré à partir des variables d'environnement http_proxy et https_proxy", + "proxyAuthorization": "Valeur à envoyer en tant qu'en-tête 'Proxy-Authorization' pour chaque requête réseau.", + "strictSSL": "Spécifie si le certificat de serveur proxy doit être vérifié par rapport à la liste des autorités de certification fournies." +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/fra/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json new file mode 100644 index 00000000000..d4d279c153f --- /dev/null +++ b/i18n/fra/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.failedToProvideRootNode": "Le TreeExplorerNodeProvider '{0}' n'a pas pu fournir le nœud racine.", + "treeExplorer.failedToResolveChildren": "Le TreeExplorerNodeProvider '{0}' n'a pas pu résoudre resolveChildren.", + "treeExplorer.notRegistered": "Aucun TreeExplorerNodeProvider ayant l'ID '{0}' n'est inscrit." +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/fra/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json new file mode 100644 index 00000000000..796aa60f732 --- /dev/null +++ b/i18n/fra/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionUnderDevelopment": "Chargement de l'extension de développement sur {0}", + "overwritingExtension": "Remplacement de l'extension {0} par {1}." +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json new file mode 100644 index 00000000000..d86f17003c2 --- /dev/null +++ b/i18n/fra/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "toggleActivityBar": "Activer/désactiver la visibilité de la barre d'activités", + "view": "Affichage" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/panel/panelPart.i18n.json index c0d1ef0d743..9cccfbfa87e 100644 --- a/i18n/fra/src/vs/workbench/browser/parts/panel/panelPart.i18n.json +++ b/i18n/fra/src/vs/workbench/browser/parts/panel/panelPart.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closePanel": "Fermer", + "closePanel": "Fermer le panneau", "focusPanel": "Focus dans le panneau", "toggleMaximizedPanel": "Activer/désactiver le panneau agrandi", "togglePanel": "Activer/désactiver le panneau", diff --git a/i18n/fra/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json index b575ccc1bc6..ba0f889c037 100644 --- a/i18n/fra/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json +++ b/i18n/fra/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json @@ -13,5 +13,5 @@ "noResultsFound1": "Résultats introuvables", "pickHistory": "Sélectionnez une entrée de l'éditeur à supprimer de l'historique", "quickOpenInput": "Tapez '?' pour obtenir de l'aide sur les actions que vous pouvez effectuer ici", - "removeFromEditorHistory": "Supprimer de l'historique des éditeurs" + "removeFromEditorHistory": "Supprimer de l'historique" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json index 43e46e1b70f..5f3823cd775 100644 --- a/i18n/fra/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json +++ b/i18n/fra/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json @@ -4,5 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "canNotRun": "La commande '{0}' ne peut pas être exécutée à partir d'ici." + "canNotRun": "La commande '{0}' n'est pas activée et ne peut pas être exécutée." } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/extensionHost.i18n.json new file mode 100644 index 00000000000..1aaa8f8bba2 --- /dev/null +++ b/i18n/fra/src/vs/workbench/electron-browser/extensionHost.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionHostProcess.crash": "L'hôte d'extension s'est terminé de façon inattendue. Rechargez la fenêtre pour reprendre l'exécution.", + "extensionHostProcess.error": "Erreur de l'hôte d'extension : {0}", + "extensionHostProcess.startupFail": "L'hôte d'extension n'a pas démarré en moins de 10 secondes. Il existe peut-être un problème.", + "extensionHostProcess.startupFailDebug": "L'hôte d'extension n'a pas démarré en moins de 10 secondes. Il est peut-être arrêté à la première ligne et a besoin d'un débogueur pour continuer." +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/electron-browser/integration.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/integration.i18n.json index 0b62855b485..d8820defa6e 100644 --- a/i18n/fra/src/vs/workbench/electron-browser/integration.i18n.json +++ b/i18n/fra/src/vs/workbench/electron-browser/integration.i18n.json @@ -6,10 +6,8 @@ { "copy": "Copier", "cut": "Couper", - "files": "fichiers", - "folders": "dossiers", - "openRecentPlaceHolder": "Sélectionner un chemin à ouvrir (maintenir la touche Ctrl enfoncée pour l'ouvrir dans une nouvelle fenêtre)", - "openRecentPlaceHolderMac": "Sélectionner un chemin (maintenir la touche Cmd enfoncée pour l'ouvrir dans une nouvelle fenêtre)", + "developer": "Développeur", + "file": "Fichier", "paste": "Coller", "redo": "Rétablir", "selectAll": "Tout Sélectionner", diff --git a/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json index e4ae5fff911..642d4fc73fb 100644 --- a/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json +++ b/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "activityBarVisibility": "Contrôle la visibilité de la barre d'activités dans le banc d'essai.", "closeOnFocusLost": "Contrôle si Quick Open doit se fermer automatiquement, une fois qu'il a perdu le focus.", - "developer": "Développeur", "editorOpenPositioning": "Contrôle l'emplacement de l'ouverture des éditeurs. Sélectionnez 'left' ou 'right' pour ouvrir les éditeurs à gauche ou à droite de l'éditeur actuellement actif. Sélectionnez 'first' ou 'last' pour ouvrir les éditeurs indépendamment de l'éditeur actuellement actif.", "enablePreview": "Contrôle si les éditeurs ouverts s'affichent en mode aperçu. Les éditeurs en mode aperçu sont réutilisés jusqu'à ce qu'ils soient conservés (par exemple, après un double-clic ou une modification).", "enablePreviewFromQuickOpen": "Contrôle si les éditeurs de Quick Open s'affichent en mode aperçu. Les éditeurs en mode aperçu sont réutilisés jusqu'à ce qu'ils soient conservés (par exemple, après un double-clic ou une modification).", @@ -15,12 +15,13 @@ "openFilesInNewWindow": "Après activation, les fichiers s'ouvrent dans une nouvelle fenêtre au lieu de réutiliser une instance existante.", "reopenFolders": "Contrôle la façon dont les dossiers sont rouverts après un redémarrage. Sélectionnez 'none' pour ne jamais rouvrir un dossier, 'one' pour rouvrir le dernier dossier utilisé, ou 'all' pour rouvrir tous les dossiers de votre dernière session.", "restoreFullscreen": "Contrôle si une fenêtre doit être restaurée en mode plein écran si elle a été fermée dans ce mode.", + "showEditorTabCloseButton": "Contrôle si les onglets de l'éditeur doivent comporter ou non un bouton de fermeture visible.", "showEditorTabs": "Contrôle si les éditeurs ouverts doivent s'afficher ou non sous des onglets.", + "showFullPath": "Si l'option est activée, le chemin complet des fichiers ouverts est affiché dans le titre de la fenêtre.", "showIcons": "Contrôle si les éditeurs ouverts doivent s'afficher ou non avec une icône. Cela implique notamment l'activation d'un thème d'icône.", "sideBarLocation": "Contrôle l'emplacement de la barre latérale. Elle peut s'afficher à gauche ou à droite du banc d'essai.", "statusBarVisibility": "Contrôle la visibilité de la barre d'état au bas du banc d'essai.", - "updateChannel": "Indiquez si vous recevez des mises à jour automatiques en provenance d'un canal de mises à jour. Un redémarrage est nécessaire en cas de modification.", - "updateConfigurationTitle": "Mettre à jour", + "titleBarStyle": "Ajustez l'apparence de la barre de titre de la fenêtre. Vous devez effectuer un redémarrage complet pour que les changements soient appliqués.", "view": "Affichage", "windowConfigurationTitle": "Fenêtre", "workbenchConfigurationTitle": "Workbench", diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json index 6717d5fb913..fc4997492e2 100644 --- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json @@ -10,18 +10,16 @@ "addToWatchExpressions": "Ajouter à la fenêtre Espion", "addWatchExpression": "Ajouter une expression", "clearRepl": "Effacer la console", - "conditionalBreakpointEditorAction": "Déboguer : ajouter un point d'arrêt conditionnel...", "continueDebug": "Continuer", "deactivateBreakpoints": "Désactiver les points d'arrêt", - "debugAddToWatch": "Déboguer : ajouter à la fenêtre Espion", "debugConsoleAction": "Console de débogage", - "debugEvaluate": "Déboguer : évaluer", "debugFocusConsole": "Focus sur la console de débogage", "disableAllBreakpoints": "Désactiver tous les points d'arrêt", "disconnectDebug": "Déconnecter", "editConditionalBreakpoint": "Modifier un point d'arrêt...", "editWatchExpression": "Modifier l'expression", "enableAllBreakpoints": "Activer tous les points d'arrêt", + "focusProcess": "Focus du processus", "launchJsonNeedsConfigurtion": "Configurer ou corriger 'launch.json'", "openLaunchJson": "Ouvrir {0}", "pauseDebug": "Suspendre", @@ -34,10 +32,9 @@ "renameFunctionBreakpoint": "Renommer un point d'arrêt sur fonction", "restartDebug": "Redémarrer", "restartFrame": "Redémarrer le frame", - "runToCursor": "Déboguer : exécuter jusqu'au curseur", + "reverseContinue": "Inverser", "selectConfig": "Sélectionner une configuration", "setValue": "Définir la valeur", - "showDebugHover": "Déboguer : afficher par pointage", "startDebug": "Démarrer le débogage", "startWithoutDebugging": "Exécuter sans débogage", "stepBackDebug": "Revenir en arrière", @@ -45,7 +42,6 @@ "stepOutDebug": "Pas à pas sortant", "stepOverDebug": "Pas à pas principal", "stopDebug": "Arrêter", - "toggleBreakpointAction": "Déboguer : activer/désactiver un point d'arrêt", "toggleEnablement": "Activer / Désactiver un point d'arrêt", "unreadOutput": "Nouvelle sortie dans la console de débogage" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json new file mode 100644 index 00000000000..688e7fd98f8 --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json @@ -0,0 +1,13 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "conditionalBreakpointEditorAction": "Déboguer : ajouter un point d'arrêt conditionnel...", + "debugAddToWatch": "Déboguer : ajouter à la fenêtre Espion", + "debugEvaluate": "Déboguer : évaluer", + "runToCursor": "Déboguer : exécuter jusqu'au curseur", + "showDebugHover": "Déboguer : afficher par pointage", + "toggleBreakpointAction": "Déboguer : activer/désactiver un point d'arrêt" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/common/debug.i18n.json new file mode 100644 index 00000000000..4067d4db263 --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/debug/common/debug.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noConfigurations": "Aucune configuration" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json index 5dafff9aa55..c06ca03fd3d 100644 --- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json @@ -11,9 +11,10 @@ "functionBreakpointPlaceholder": "Fonction où effectuer un point d'arrêt", "functionBreakpointsNotSupported": "Les points d'arrêt de fonction ne sont pas pris en charge par ce type de débogage", "loadMoreStackFrames": "Charger plus de frames de pile", - "paused": "en pause", + "paused": "Suspendu", + "pausedOn": "En pause sur {0}", "process": "Processus", - "running": "en cours d'exécution", + "running": "En cours d'exécution", "stackFrameAriaLabel": "Frame de pile {0}, ligne {1} {2}, pile des appels, débogage", "thread": "Thread", "threadAriaLabel": "Thread {0}, pile des appels, débogage", diff --git a/i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json index b0bb192958e..b8b7ce7841c 100644 --- a/i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debugConfigurationNames": "Configurations lancées dans le cadre de cette configuration \"composite\". Uniquement respecté si le type de cette configuration est \"composite\".", "debugLinuxConfiguration": "Attributs de configuration de lancement spécifiques à Linux.", "debugName": "Le nom de la configuration s'affiche dans le menu déroulant de la configuration de lancement.", "debugOSXConfiguration": "Attributs de configuration de lancement spécifiques à OS X.", "debugPrelaunchTask": "Tâche à exécuter avant le démarrage de la session de débogage.", "debugRequest": "Type de requête de configuration. Il peut s'agir de \"launch\" ou \"attach\".", + "debugServer": "Pour le développement d'une extension de débogage uniquement : si un port est spécifié, VS Code tente de se connecter à un adaptateur de débogage s'exécutant en mode serveur", "debugType": "Type de configuration.", "debugWindowsConfiguration": "Attributs de configuration de lancement spécifiques à Windows.", "internalConsoleOptions": "Contrôle le comportement de la console de débogage interne.", diff --git a/i18n/fra/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json index ce20fe12dfe..89204ce6c14 100644 --- a/i18n/fra/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json @@ -6,6 +6,7 @@ { "DebugConfig.failed": "Impossible de créer le fichier 'launch.json' dans le dossier '.vscode' ({0}).", "app.launch.json.configurations": "Liste des configurations. Ajoutez de nouvelles configurations, ou modifiez celles qui existent déjà à l'aide d'IntelliSense.", + "app.launch.json.debugServer": "DÉCONSEILLÉ : placez debugServer dans une configuration.", "app.launch.json.title": "Lancer", "app.launch.json.version": "Version de ce format de fichier.", "debugNoType": "Le 'type' de l'adaptateur de débogage ne peut pas être omis. Il doit s'agir du type 'string'.", diff --git a/i18n/fra/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json b/i18n/fra/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json new file mode 100644 index 00000000000..a248b7ddb83 --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.noMatchingProviderId": "Aucun TreeExplorerNodeProvider ayant l'ID {providerId} n'est inscrit." +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json new file mode 100644 index 00000000000..e378233f23f --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.invalidId": "Échec d'activation de l'extension de l'Explorateur d'arborescences {0} en raison d'un ID non valide.", + "vscode.extension.contributes.explorer": "Utilise la viewlet de l'Explorateur d'arborescences personnalisé dans la barre latérale", + "vscode.extension.contributes.explorer.icon": "Chemin de l'icône de viewlet dans la barre d'activités", + "vscode.extension.contributes.explorer.treeExplorerNodeProviderId": "ID unique permettant d'identifier le fournisseur inscrit via vscode.workspace.registerTreeExplorerNodeProvider", + "vscode.extension.contributes.explorer.treeLabel": "Chaîne contrôlable de visu permettant d'afficher l'Explorateur d'arborescences personnalisé" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json new file mode 100644 index 00000000000..92713a40270 --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "disable": "Désactiver", + "enable": "Activer", + "treeExplorer.toggle": "Activer/désactiver l'Explorateur personnalisé", + "view": "Affichage" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json new file mode 100644 index 00000000000..a6e6588d9c3 --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "refresh": "Actualiser" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/fra/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json new file mode 100644 index 00000000000..0da5f380d60 --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorerViewlet.tree": "Section de l'Explorateur d'arborescences" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json new file mode 100644 index 00000000000..d50484e8043 --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "Unknown Dependency": "Dépendance inconnue :", + "error": "Erreur" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json new file mode 100644 index 00000000000..d155b058f0a --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json @@ -0,0 +1,39 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "JSON Validation": "Validation JSON ({0})", + "changelog": "Journal des modifications", + "command name": "Nom", + "commands": "Commandes ({0})", + "contributions": "Contributions", + "debugger name": "Nom", + "debuggers": "Débogueurs ({0})", + "default": "Par défaut", + "dependencies": "Dépendances", + "description": "Description", + "details": "Détails", + "extension id": "Identificateur d'extension", + "file extensions": "Extensions de fichier", + "grammar": "Grammaire", + "install count": "Nombre d'installations", + "keyboard shortcuts": "Racco&&urcis clavier", + "language id": "ID", + "language name": "Nom", + "languages": "Langages ({0})", + "license": "Licence", + "menuContexts": "Contextes de menu", + "name": "Nom de l'extension", + "noChangelog": "Aucun Changelog disponible.", + "noContributions": "Aucune contribution", + "noDependencies": "Aucune dépendance", + "noReadme": "Aucun fichier README disponible.", + "publisher": "Nom de l'éditeur", + "rating": "Évaluation", + "setting name": "Nom", + "settings": "Paramètres ({0})", + "snippets": "Extraits", + "themes": "Thèmes ({0})" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json new file mode 100644 index 00000000000..2dc8b02124c --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "close": "Fermer", + "neverShowAgain": "Ne plus afficher", + "reallyRecommended": "Il est recommandé d'installer l'extension '{0}'.", + "showRecommendations": "Afficher les recommandations", + "workspaceRecommended": "Cet espace de travail a des recommandations d'extension." +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json new file mode 100644 index 00000000000..16dd6671984 --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json @@ -0,0 +1,38 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "ConfigureWorkspaceRecommendations.noWorkspace": "Les recommandations ne sont disponibles que pour un dossier d'espace de travail.", + "OpenExtensionsFile.failed": "Impossible de créer le fichier 'extensions.json' dans le dossier '.vscode' ({0}).", + "Uninstalling": "Désinstallation en cours", + "builtin": "Intégrée", + "clearExtensionsInput": "Effacer l'entrée des extensions", + "configureWorkspaceRecommendedExtensions": "Configurer les extensions recommandées (espace de travail)", + "disableAction": "Désactiver", + "disableAlwaysAction.label": "Désactiver", + "disableForWorkspaceAction": "Espace de travail", + "disableForWorkspaceAction.label": "Désactiver (espace de travail)", + "disableGloballyAction": "Toujours", + "enableAction": "Activer", + "enableAlwaysAction.label": "Activer", + "enableForWorkspaceAction": "Espace de travail", + "enableForWorkspaceAction.label": "Activer (espace de travail)", + "enableGloballyAction": "Toujours", + "installAction": "Installer", + "installExtensions": "Installer les extensions", + "installing": "Installation", + "postUninstallTooltip": "Recharger pour désactiver", + "reloadAction": "Recharger", + "showDisabledExtensions": "Afficher les extensions désactivées", + "showInstalledExtensions": "Afficher les extensions installées", + "showOutdatedExtensions": "Afficher les extensions obsolètes", + "showPopularExtensions": "Afficher les extensions les plus demandées", + "showRecommendedExtensions": "Afficher les extensions recommandées", + "showWorkspaceRecommendedExtensions": "Afficher les extensions recommandées pour l'espace de travail", + "toggleExtensionsViewlet": "Afficher les extensions", + "uninstallAction": "Désinstaller", + "updateAction": "Mettre à jour", + "updateAll": "Mettre à jour toutes les extensions" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json new file mode 100644 index 00000000000..f07aa55b38e --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "manage": "Appuyez sur Entrée pour gérer vos extensions.", + "noExtensionsToInstall": "Tapez un nom d'extension", + "searchFor": "Appuyez sur Entrée pour rechercher '{0}' dans le Marketplace." +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json new file mode 100644 index 00000000000..54eccc5dbe5 --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "app.extension.identifier.errorMessage": "Format attendu : '${publisher}.${name}'. Exemple : 'vscode.csharp'.", + "app.extensions.json.recommendations": "Liste des recommandations d'extensions. L'identificateur d'une extension est toujours '${publisher}.${name}'. Exemple : 'vscode.csharp'.", + "app.extensions.json.title": "Extensions" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json new file mode 100644 index 00000000000..441d4c10bdd --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionsInputName": "Extension : {0}" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json index c10db2490cc..91d562db06b 100644 --- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json @@ -4,49 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "ConfigureWorkspaceRecommendations.noWorkspace": "Les recommandations ne sont disponibles que pour un dossier d'espace de travail.", - "OpenExtensionsFile.failed": "Impossible de créer le fichier 'extensions.json' dans le dossier '.vscode' ({0}).", - "Uninstalling": "Désinstallation en cours", - "builtin": "Intégrée", - "clearExtensionsInput": "Effacer l'entrée des extensions", - "configureWorkspaceRecommendedExtensions": "Configurer les extensions recommandées (espace de travail)", - "disableAction": "Désactiver", - "disableAll": "Désactiver tout", - "disableAllWorkspace": "Désactiver tout (espace de travail)", - "disableAlwaysAction.label": "Désactiver", - "disableForWorkspaceAction": "Espace de travail", - "disableForWorkspaceAction.label": "Désactiver (espace de travail)", - "disableGloballyAction": "Toujours", - "enableAction": "Activer", - "enableAll": "Activer tout", - "enableAllWorkspace": "Activer tout (espace de travail)", - "enableAlwaysAction.label": "Activer", - "enableForWorkspaceAction": "Espace de travail", - "enableForWorkspaceAction.label": "Activer (espace de travail)", - "enableGloballyAction": "Toujours", - "installAction": "Installer", - "installExtensions": "Installer les extensions", + "InstallVSIXAction.reloadNow": "Recharger maintenant", + "InstallVSIXAction.success": "Installation réussie de l'extension. Effectuez un redémarrage pour l'activer.", "installVSIX": "Installer depuis un VSIX...", - "installing": "Installation", - "openExtensionsFolder": "Ouvrir le dossier d'extensions", - "postDisableMessage": "Recharger cette fenêtre pour désactiver l'extension '{0}' ?", - "postDisableTooltip": "Recharger pour désactiver", - "postEnableMessage": "Recharger cette fenêtre pour activer l'extension '{0}' ?", - "postEnableTooltip": "Recharger pour activer", - "postInstallMessage": "Recharger cette fenêtre pour activer l'extension '{0}' ?", - "postInstallTooltip": "Recharger pour activer", - "postUninstallMessage": "Recharger cette fenêtre pour désactiver l'extension '{0}' ?", - "postUninstallTooltip": "Recharger pour désactiver", - "reloadAction": "Recharger", - "reloadNow": "Recharger maintenant", - "showDisabledExtensions": "Afficher les extensions désactivées", - "showInstalledExtensions": "Afficher les extensions installées", - "showOutdatedExtensions": "Afficher les extensions obsolètes", - "showPopularExtensions": "Afficher les extensions les plus demandées", - "showRecommendedExtensions": "Afficher les extensions recommandées", - "showWorkspaceRecommendedExtensions": "Afficher les extensions recommandées pour l'espace de travail", - "toggleExtensionsViewlet": "Afficher les extensions", - "uninstallAction": "Désinstaller", - "updateAction": "Mettre à jour", - "updateAll": "Mettre à jour toutes les extensions" + "openExtensionsFolder": "Ouvrir le dossier d'extensions" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json index fe86384db37..c31d2342803 100644 --- a/i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json @@ -20,10 +20,11 @@ "files.exclude.when": "Vérification supplémentaire des frères d'un fichier correspondant. Utilisez $(basename) comme variable pour le nom de fichier correspondant.", "filesConfigurationTitle": "Fichiers", "formatOnSave": "Met en forme un fichier au moment de l'enregistrement. Un formateur doit être disponible, le fichier ne doit pas être enregistré automatiquement, et l'éditeur ne doit pas être en cours d'arrêt.", + "insertFinalNewline": "Quand l'option est activée, une nouvelle ligne finale est insérée à la fin du fichier au moment de son enregistrement.", "openEditorsVisible": "Nombre d'éditeurs affichés dans le volet Éditeurs ouverts. Définissez la valeur 0 pour masquer le volet.", "showExplorerViewlet": "Afficher l'Explorateur", "textFileEditor": "Éditeur de fichier texte", - "trimTrailingWhitespace": "Si l'option est activée, l'espace blanc de fin est découpé quand vous enregistrez un fichier.", + "trimTrailingWhitespace": "Si l'option est activée, l'espace blanc de fin est supprimé au moment de l'enregistrement d'un fichier.", "view": "Affichage", "watcherExclude": "Configurez les modèles Glob des chemins de fichiers à exclure de la surveillance des fichiers. La modification de ce paramètre nécessite un redémarrage. Si vous constatez que le code consomme beaucoup de temps processeur au démarrage, excluez les dossiers volumineux pour réduire la charge initiale." } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/fra/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json index e6876a1a3e3..78e4a2193ca 100644 --- a/i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "errors.warnings.show.label": "Erreurs et avertissements", + "errors.warnings.show.label": "Afficher les erreurs et les avertissements", "markers.panel.action.filter": "Filtrer les problèmes", "markers.panel.aria.label.problems.tree": "Problèmes regroupés par fichiers", "markers.panel.at.ln.col.number": "({0}, {1})", @@ -25,15 +25,15 @@ "markers.panel.title.problems": "Problèmes", "problems.panel.configuration.autoreveal": "Contrôle si l'affichage des problèmes doit automatiquement montrer les fichiers quand il les ouvre", "problems.panel.configuration.title": "Affichage des problèmes", - "problems.tree.aria.label.error.marker": "Erreur générée par {0} : {1} à la ligne {2} et à la colonne {3}", - "problems.tree.aria.label.error.marker.nosource": "Erreur : {0} à la ligne {1} et à la colonne {2}", - "problems.tree.aria.label.info.marker": "Info générée par {0} : {1} à la ligne {2} et à la colonne {3}", - "problems.tree.aria.label.info.marker.nosource": "Info : {0} à la ligne {1} et à la colonne {2}", - "problems.tree.aria.label.marker": "Problème généré par {0} : {1} à la ligne {2} et à la colonne {3}", - "problems.tree.aria.label.marker.nosource": "Problème : {0} à la ligne {1} et à la colonne {2}", + "problems.tree.aria.label.error.marker": "Erreur générée par {0} : {1} à la ligne {2} et au caractère {3}", + "problems.tree.aria.label.error.marker.nosource": "Erreur : {0} à la ligne {1} et au caractère {2}", + "problems.tree.aria.label.info.marker": "Information générée par {0} : {1} à la ligne {2} et au caractère {3}", + "problems.tree.aria.label.info.marker.nosource": "Information : {0} à la ligne {1} et au caractère {2}", + "problems.tree.aria.label.marker": "Problème généré par {0} : {1} à la ligne {2} et au caractère {3}", + "problems.tree.aria.label.marker.nosource": "Problème : {0} à la ligne {1} et au caractère {2}", "problems.tree.aria.label.resource": "{0} avec {1} problèmes", - "problems.tree.aria.label.warning.marker": "Avertissement généré par {0} : {1} à la ligne {2} et à la colonne {3}", - "problems.tree.aria.label.warning.marker.nosource": "Avertissement : {0} à la ligne {1} et à la colonne {2}", + "problems.tree.aria.label.warning.marker": "Avertissement généré par {0} : {1} à la ligne {2} et au caractère {3}", + "problems.tree.aria.label.warning.marker.nosource": "Avertissement : {0} à la ligne {1} et au caractère {2}", "problems.view.show.label": "Afficher les problèmes", "viewCategory": "Affichage" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json new file mode 100644 index 00000000000..113935b79d5 --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "neverAgain": "Ne plus afficher", + "remindLater": "Me le rappeler plus tard", + "surveyQuestion": "Acceptez-vous de répondre à une enquête rapide ?", + "takeSurvey": "Répondre à l'enquête" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json index 18f2232d6c4..ed6a3026c92 100644 --- a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json @@ -25,12 +25,12 @@ "JsonSchema.options.cwd": "Répertoire de travail actif du programme ou script exécuté. En cas d'omission, la racine de l'espace de travail actif de Code est utilisée.", "JsonSchema.options.env": "Environnement du programme ou de l'interpréteur de commandes exécuté. En cas d'omission, l'environnement du processus parent est utilisé.", "JsonSchema.pattern.code": "Index de groupe de correspondance du code du problème. La valeur par défaut est non définie", - "JsonSchema.pattern.column": "Index de groupe de correspondance de la colonne du problème. La valeur par défaut est 3", - "JsonSchema.pattern.endColumn": "Index de groupe de correspondance de la colonne de fin du problème. La valeur par défaut est non définie", + "JsonSchema.pattern.column": "Index de groupe de correspondance du caractère de ligne du problème. La valeur par défaut est 3", + "JsonSchema.pattern.endColumn": "Index de groupe de correspondance du caractère de ligne de fin du problème. La valeur par défaut est non définie", "JsonSchema.pattern.endLine": "Index de groupe de correspondance de la ligne de fin du problème. La valeur par défaut est non définie", "JsonSchema.pattern.file": "Index de groupe de correspondance du nom de fichier. En cas d'omission, 1 est utilisé.", "JsonSchema.pattern.line": "Index de groupe de correspondance de la ligne du problème. La valeur par défaut est 2", - "JsonSchema.pattern.location": "Index de groupe de correspondance de l'emplacement du problème. Les modèles d'emplacement valides sont : (line), (line,column) et (startLine,startColumn,endLine,endColumn). En cas d'omission, line et column sont choisis par défaut.", + "JsonSchema.pattern.location": "Index de groupe de correspondance de l'emplacement du problème. Les modèles d'emplacement valides sont : (line), (line,column) et (startLine,startColumn,endLine,endColumn). En cas d'omission, (line,column) est choisi par défaut.", "JsonSchema.pattern.loop": "Dans une boucle de détecteur de problèmes de correspondance multiligne, indique si le modèle est exécuté en boucle tant qu'il correspond. Peut uniquement être spécifié dans le dernier modèle d'un modèle multiligne.", "JsonSchema.pattern.message": "Index de groupe de correspondance du message. En cas d'omission, la valeur par défaut est 4 si l'emplacement est spécifié. Sinon, la valeur par défaut est 5.", "JsonSchema.pattern.regexp": "Expression régulière permettant de trouver une erreur, un avertissement ou une information dans la sortie.", @@ -69,7 +69,7 @@ "RunTaskAction.label": "Exécuter la tâche", "ShowLogAction.label": "Afficher le journal des tâches", "TaskSystem.active": "Une tâche active est en cours d'exécution. Terminez-la avant d'exécuter une autre tâche.", - "TaskSystem.activeSame": "La tâche est déjà active et en mode espion.", + "TaskSystem.activeSame": "La tâche est déjà active et en mode espion. Pour terminer la tâche, utilisez 'F1 > terminer la tâche'", "TaskSystem.exitAnyways": "&&Quitter quand même", "TaskSystem.invalidTaskJson": "Erreur : le fichier tasks.json contient des erreurs de syntaxe. Corrigez-les avant d'exécuter une tâche.\n", "TaskSystem.noBuildType": "Aucun exécuteur de tâches valide n'est configuré. Les exécuteurs de tâches valides sont 'service' et 'program'.", diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json index fe860416b9e..ff6e32f660a 100644 --- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "terminal.integrated.copySelection.noSelection": "Impossible de copier la sélection du terminal quand il n'a pas le focus", - "terminal.integrated.exitedWithCode": "Le processus du terminal s'est achevé avec le code de sortie {0}" + "terminal.integrated.exitedWithCode": "Le processus du terminal s'est achevé avec le code de sortie {0}", + "terminal.integrated.launchFailed": "Échec du lancement de la commande de traitement du terminal '{0}{1}' (code de sortie : {2})" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/services/history/browser/history.i18n.json b/i18n/fra/src/vs/workbench/services/history/browser/history.i18n.json index 438dc1f90f4..f54268d6ddf 100644 --- a/i18n/fra/src/vs/workbench/services/history/browser/history.i18n.json +++ b/i18n/fra/src/vs/workbench/services/history/browser/history.i18n.json @@ -5,7 +5,7 @@ // Do not edit this file. It is machine generated. { "devExtensionWindowTitle": "[Hôte de développement d'extension] - {0}", - "patchedWindowTitle": " [Non pris en charge]", + "patchedWindowTitle": "[Non pris en charge]", "prefixDecoration": "● {0}", "prefixTitle": "{0} - {1}", "prefixWorkspaceTitle": "{0} - {1} - {2}", diff --git a/i18n/fra/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/fra/src/vs/workbench/services/message/browser/messageList.i18n.json new file mode 100644 index 00000000000..eb5db67b546 --- /dev/null +++ b/i18n/fra/src/vs/workbench/services/message/browser/messageList.i18n.json @@ -0,0 +1,14 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "alertErrorMessage": "Erreur : {0}", + "alertInfoMessage": "Information : {0}", + "alertWarningMessage": "Avertissement : {0}", + "close": "Fermer", + "error": "Erreur", + "info": "Informations", + "warning": "Avertir" +} \ No newline at end of file diff --git a/i18n/ita/extensions/typescript/package.i18n.json b/i18n/ita/extensions/typescript/package.i18n.json index c41d630159d..3c322aae8c0 100644 --- a/i18n/ita/extensions/typescript/package.i18n.json +++ b/i18n/ita/extensions/typescript/package.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "configuration.typescript": "TypeScript.", + "configuration.typescript": "TypeScript", "format.insertSpaceAfterCommaDelimiter": "Consente di definire la gestione dello spazio dopo una virgola di delimitazione6", "format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Consente di definire la gestione dello spazio dopo la parola chiave function per funzioni anonime.", "format.insertSpaceAfterKeywordsInControlFlowStatements": "Consente di definire la gestione dello spazio dopo le parole chiave nell'istruzione del flusso di controllo.", diff --git a/i18n/ita/src/vs/code/electron-main/menus.i18n.json b/i18n/ita/src/vs/code/electron-main/menus.i18n.json index a10bfd06afb..54ae76a214e 100644 --- a/i18n/ita/src/vs/code/electron-main/menus.i18n.json +++ b/i18n/ita/src/vs/code/electron-main/menus.i18n.json @@ -46,6 +46,7 @@ "miGotoLine": "Vai alla &&riga...", "miGotoSymbolInFile": "Vai al &&simbolo nel file...", "miGotoSymbolInWorkspace": "Vai al &&simbolo nell'area di lavoro...", + "miHideActivityBar": "Nascondi &&barra attività", "miHideStatusbar": "&&Nascondi barra di stato", "miInstallingUpdate": "Installazione dell'aggiornamento...", "miIntroductoryVideos": "&&Video introduttivi", @@ -88,6 +89,7 @@ "miSelectAll": "&&Seleziona tutto", "miSelectColorTheme": "&&Tema colori", "miSelectIconTheme": "Tema &&icona file", + "miShowActivityBar": "Mostra &&barra attività", "miShowStatusbar": "&&Mostra barra di stato", "miSplitEditor": "Dividi &&editor", "miSwitchEditor": "Cambia &&editor", diff --git a/i18n/ita/src/vs/code/electron-main/windows.i18n.json b/i18n/ita/src/vs/code/electron-main/windows.i18n.json index 0ce3269b7e2..0f699d616bd 100644 --- a/i18n/ita/src/vs/code/electron-main/windows.i18n.json +++ b/i18n/ita/src/vs/code/electron-main/windows.i18n.json @@ -10,10 +10,14 @@ "appStalled": "La finestra non risponde", "appStalledDetail": "È possibile riaprire la finestra, chiuderla oppure attendere.", "close": "Chiudi", + "folderDesc": "{0} {1}", "hiddenMenuBar": "È comunque possibile accedere alla barra dei menu premendo **ALT**.", + "newWindow": "Nuova finestra", + "newWindowDesc": "Apre una nuova finestra", "ok": "OK", "pathNotExistDetail": "Il percorso '{0}' sembra non esistere più sul disco.", "pathNotExistTitle": "Il percorso non esiste", + "recentFolders": "Cartelle recenti", "reopen": "Riapri", "wait": "Continua ad attendere" } \ No newline at end of file diff --git a/i18n/ita/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/ita/src/vs/editor/common/services/modelServiceImpl.i18n.json index 35a8f29280e..ae4d2a4bc14 100644 --- a/i18n/ita/src/vs/editor/common/services/modelServiceImpl.i18n.json +++ b/i18n/ita/src/vs/editor/common/services/modelServiceImpl.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "diagAndSource": "[{0}] {1}", + "diagAndSourceMultiline": "[{0}]\n{1}", "indentAutoMigrate": "Aggiornare le impostazioni: `editor.detectIndentation` sostituisce `editor.tabSize`: \"auto\" o `editor.insertSpaces`: \"auto\"" } \ No newline at end of file diff --git a/i18n/ita/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/ita/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json new file mode 100644 index 00000000000..a00b50b0230 --- /dev/null +++ b/i18n/ita/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json @@ -0,0 +1,19 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "parseErrors": "Errori durante l'analisi di {0}: {1}", + "schema.autoClosingPairs": "Definisce le coppie di parentesi quadre. Quando viene immessa una parentesi quadra di apertura, quella di chiusura viene inserita automaticamente.", + "schema.autoClosingPairs.notIn": "Definisce un elenco di ambiti in cui la corrispondenza automatica delle coppie è disabilitata.", + "schema.blockComment.begin": "Sequenza di caratteri che indica l'inizio di un commento per il blocco.", + "schema.blockComment.end": "Sequenza di caratteri che termina i commenti per il blocco.", + "schema.blockComments": "Definisce il modo in cui sono contrassegnati i commenti per il blocco.", + "schema.brackets": "Definisce i simboli di parentesi quadra che aumentano o riducono il rientro.", + "schema.closeBracket": "Sequenza di stringa o carattere parentesi quadra di chiusura.", + "schema.comments": "Definisce i simboli di commento", + "schema.lineComment": "Sequenza di caratteri che indica l'inizio di un commento per la riga.", + "schema.openBracket": "Sequenza di stringa o carattere parentesi quadra di apertura.", + "schema.surroundingPairs": "Definisce le coppie di parentesi quadre che possono essere usate per racchiudere una stringa selezionata." +} \ No newline at end of file diff --git a/i18n/ita/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/ita/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json new file mode 100644 index 00000000000..2f82670448d --- /dev/null +++ b/i18n/ita/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noWorkspace": "Non esiste alcuna area di lavoro." +} \ No newline at end of file diff --git a/i18n/ita/src/vs/platform/request/node/request.i18n.json b/i18n/ita/src/vs/platform/request/node/request.i18n.json new file mode 100644 index 00000000000..7636a597b5b --- /dev/null +++ b/i18n/ita/src/vs/platform/request/node/request.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "httpConfigurationTitle": "HTTP", + "proxy": "Impostazione proxy da usare. Se non è impostata, verrà ottenuta dalle variabili di ambiente http_proxy e https_proxy", + "proxyAuthorization": "Valore da inviare come intestazione 'Proxy-Authorization' per ogni richiesta di rete.", + "strictSSL": "Indica se il certificato del server proxy deve essere verificato in base all'elenco di CA specificate." +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/ita/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json new file mode 100644 index 00000000000..c8d7807f8e9 --- /dev/null +++ b/i18n/ita/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.failedToProvideRootNode": "Con l'elemento TreeExplorerNodeProvider '{0}' non è stato possibile fornire il nodo radice.", + "treeExplorer.failedToResolveChildren": "Con l'elemento TreeExplorerNodeProvider '{0}' non è stato possibile risolvere gli elementi figlio.", + "treeExplorer.notRegistered": "Non è stato registrato alcun elemento TreeExplorerNodeProvider con ID '{0}'." +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/ita/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json new file mode 100644 index 00000000000..73c3474456a --- /dev/null +++ b/i18n/ita/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionUnderDevelopment": "Caricamento dell'estensione di sviluppo in {0}", + "overwritingExtension": "Sovrascrittura dell'estensione {0} con {1}." +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json new file mode 100644 index 00000000000..f4ee1472cda --- /dev/null +++ b/i18n/ita/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "toggleActivityBar": "Attiva/Disattiva visibilità della barra attività", + "view": "Visualizza" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json index 94eaa06ea69..06cd12304a9 100644 --- a/i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json +++ b/i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json @@ -5,8 +5,8 @@ // Do not edit this file. It is machine generated. { "commandDeprecated": "Il comando **{0}** è stato rimosso. In alternativa, usare **{1}**", - "editorCommand.activeEditorMove.arg.description": "Proprietà degli argomenti:\n\t\t\t\t\t\t* 'to': valore stringa che specifica dove eseguire lo spostamento.\n\t\t\t\t\t\t* 'by': valore stringa che specifica l'unità per lo spostamento, ovvero per tabulazione o per gruppo.\n\t\t\t\t\t\t* 'value': valore numerico che specifica il numero di posizioni o una posizione assoluta per lo spostamento.\n\t\t\t\t\t", + "editorCommand.activeEditorMove.arg.description": "Proprietà degli argomenti:\n\t\t\t\t\t\t* 'to': valore stringa che specifica dove eseguire lo spostamento.\n\t\t\t\t\t\t* 'by': valore stringa che specifica l'unità per lo spostamento, ovvero per scheda o per gruppo.\n\t\t\t\t\t\t* 'value': valore numerico che specifica il numero di posizioni o una posizione assoluta per lo spostamento.\n\t\t\t\t\t", "editorCommand.activeEditorMove.arg.name": "Argomento per spostamento editor attivo", - "editorCommand.activeEditorMove.description": "Consente di spostare l'editor attivo per tabulazioni o gruppi", + "editorCommand.activeEditorMove.description": "Consente di spostare l'editor attivo per schede o gruppi", "openKeybindings": "Configura tasti di scelta rapida" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/panel/panelPart.i18n.json index 83640b14692..6333e3ea513 100644 --- a/i18n/ita/src/vs/workbench/browser/parts/panel/panelPart.i18n.json +++ b/i18n/ita/src/vs/workbench/browser/parts/panel/panelPart.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closePanel": "Chiudi", + "closePanel": "Chiudi pannello", "focusPanel": "Sposta lo stato attivo nel pannello", "toggleMaximizedPanel": "Attiva/Disattiva pannello ingrandito", "togglePanel": "Attiva/Disattiva pannello", diff --git a/i18n/ita/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json index c759cb7aee9..916876f8c9e 100644 --- a/i18n/ita/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json +++ b/i18n/ita/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json @@ -13,5 +13,5 @@ "noResultsFound1": "Non sono stati trovati risultati", "pickHistory": "Selezionare una voce dell'editor da rimuovere dalla cronologia", "quickOpenInput": "Digitare '?' per visualizzare la Guida relativa alle azioni che è possibile eseguire qui", - "removeFromEditorHistory": "Rimuovi dalla cronologia dell'editor" + "removeFromEditorHistory": "Rimuovi dalla cronologia" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json index 3ac08461c27..cc60feea391 100644 --- a/i18n/ita/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json +++ b/i18n/ita/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json @@ -4,5 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "canNotRun": "Non è possibile eseguire il comando '{0}' da questa posizione." + "canNotRun": "Il comando '{0}' non è attualmente abilitato e non può essere eseguito." } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/extensionHost.i18n.json new file mode 100644 index 00000000000..30e89fc8bbb --- /dev/null +++ b/i18n/ita/src/vs/workbench/electron-browser/extensionHost.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionHostProcess.crash": "L'host dell'estensione è stato terminato in modo imprevisto. Ricaricare la finestra per ripristinare.", + "extensionHostProcess.error": "Errore restituito dall'host dell'estensione: {0}", + "extensionHostProcess.startupFail": "L'host dell'estensione non è stato avviato entro 10 secondi. Potrebbe essersi verificato un problema.", + "extensionHostProcess.startupFailDebug": "L'host dell'estensione non è stato avviato entro 10 secondi. Potrebbe essersi arrestato alla prima riga e richiedere un debugger per continuare." +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/electron-browser/integration.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/integration.i18n.json index f2f7a72a924..a653b5d0250 100644 --- a/i18n/ita/src/vs/workbench/electron-browser/integration.i18n.json +++ b/i18n/ita/src/vs/workbench/electron-browser/integration.i18n.json @@ -6,10 +6,8 @@ { "copy": "Copia", "cut": "Taglia", - "files": "file", - "folders": "cartelle", - "openRecentPlaceHolder": "Selezionare un percorso da aprire (tenere premuto CTRL per aprirlo in una nuova finestra)", - "openRecentPlaceHolderMac": "Selezionare un percorso (tenere premuto CMD per aprirlo in una nuova finestra)", + "developer": "Sviluppatore", + "file": "File", "paste": "Incolla", "redo": "Ripristina", "selectAll": "Seleziona tutto", diff --git a/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json index a6ce8b0e895..4db417928f4 100644 --- a/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json +++ b/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "activityBarVisibility": "Controlla la visibilità della barra attività nel workbench.", "closeOnFocusLost": "Controlla se Quick Open deve essere chiuso automaticamente quando perde lo stato attivo.", - "developer": "Sviluppatore", "editorOpenPositioning": "Controlla la posizione in cui vengono aperti gli editor. Selezionare 'left' o 'right' per aprire gli editor a sinistra o a destra di quello attualmente attivo. Selezionare 'first' o 'last' per aprire gli editor indipendentemente da quello attualmente attivo.", "enablePreview": "Controlla se gli editor aperti vengono visualizzati come anteprima. Le anteprime editor vengono riutilizzate finché vengono mantenute, ad esempio tramite doppio clic o modifica.", "enablePreviewFromQuickOpen": "Controlla se gli editor aperti da Quick Open vengono visualizzati come anteprima. Le anteprime editor vengono riutilizzate finché vengono mantenute, ad esempio tramite doppio clic o modifica.", @@ -15,12 +15,13 @@ "openFilesInNewWindow": "Se abilitata, apre i file in una nuova finestra invece di riutilizzare un'istanza esistente.", "reopenFolders": "Controlla la modalità di riapertura delle cartelle dopo un riavvio. Selezionare 'none' per non riaprire mai una cartella, 'one' per riaprire l'ultima cartella usata oppure 'all' per riaprire tutte le cartelle dell'ultima sessione.", "restoreFullscreen": "Controlla se una finestra deve essere ripristinata a schermo intero se è stata chiusa in questa modalità.", + "showEditorTabCloseButton": "Controlla se nelle schede dell'editor deve essere presente o meno un pulsante Chiudi visibile.", "showEditorTabs": "Controlla se visualizzare o meno gli editor aperti in schede.", + "showFullPath": "Se è abilitato, visualizzerà il percorso completo dei file aperti nel titolo della finestra.", "showIcons": "Controlla se visualizzare o meno un'icona per gli editor aperti. Richiede l'abilitazione anche di un tema dell'icona.", "sideBarLocation": "Controlla la posizione della barra laterale. Può essere visualizzata a sinistra o a destra del workbench.", "statusBarVisibility": "Controlla la visibilità della barra di stato nella parte inferiore del workbench.", - "updateChannel": "Consente di configurare la ricezione degli aggiornamenti automatici da un canale di aggiornamento. Richiede un riavvio dopo la modifica.", - "updateConfigurationTitle": "Aggiorna", + "titleBarStyle": "Consente di modificare l'aspetto della barra del titolo della finestra. Per applicare le modifiche, è necessario un riavvio completo.", "view": "Visualizza", "windowConfigurationTitle": "Finestra", "workbenchConfigurationTitle": "Workbench", diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json index 5f4ecb685c9..2da49b1f127 100644 --- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json @@ -10,18 +10,16 @@ "addToWatchExpressions": "Aggiungi a espressione di controllo", "addWatchExpression": "Aggiungi espressione", "clearRepl": "Cancella console", - "conditionalBreakpointEditorAction": "Debug: Aggiungi Punto di interruzione condizionale...", "continueDebug": "Continua", "deactivateBreakpoints": "Disattiva punti di interruzione", - "debugAddToWatch": "Debug: Aggiungi a espressione di controllo", "debugConsoleAction": "Console di debug", - "debugEvaluate": "Debug: Valuta", "debugFocusConsole": "Console di debug stato attivo", "disableAllBreakpoints": "Disabilita tutti i punti di interruzione", "disconnectDebug": "Disconnetti", "editConditionalBreakpoint": "Modifica punto di interruzione...", "editWatchExpression": "Modifica espressione", "enableAllBreakpoints": "Abilita tutti i punti di interruzione", + "focusProcess": "Sposta stato attivo su processo", "launchJsonNeedsConfigurtion": "Configurare o correggere 'launch.json'", "openLaunchJson": "Apri {0}", "pauseDebug": "Sospendi", @@ -34,10 +32,9 @@ "renameFunctionBreakpoint": "Rinomina punto di interruzione della funzione", "restartDebug": "Riavvia", "restartFrame": "Riavvia frame", - "runToCursor": "Debug: Esegui fino al cursore", + "reverseContinue": "Inverti", "selectConfig": "Seleziona configurazione", "setValue": "Imposta valore", - "showDebugHover": "Debug: Visualizza passaggio del mouse", "startDebug": "Avvia debug", "startWithoutDebugging": "Avvia senza eseguire debug", "stepBackDebug": "Torna indietro", @@ -45,7 +42,6 @@ "stepOutDebug": "Esci da istruzione/routine", "stepOverDebug": "Esegui istruzione/routine", "stopDebug": "Arresta", - "toggleBreakpointAction": "Debug: Attiva/Disattiva punto di interruzione", "toggleEnablement": "Abilita/Disabilita punto di interruzione", "unreadOutput": "Nuovo output nella console di debug" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json new file mode 100644 index 00000000000..5175a9b35eb --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json @@ -0,0 +1,13 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "conditionalBreakpointEditorAction": "Debug: Aggiungi Punto di interruzione condizionale...", + "debugAddToWatch": "Debug: Aggiungi a espressione di controllo", + "debugEvaluate": "Debug: Valuta", + "runToCursor": "Debug: Esegui fino al cursore", + "showDebugHover": "Debug: Visualizza passaggio del mouse", + "toggleBreakpointAction": "Debug: Attiva/Disattiva punto di interruzione" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/common/debug.i18n.json new file mode 100644 index 00000000000..642168b22d8 --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/debug/common/debug.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noConfigurations": "Non ci sono configurazioni" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json index 368e891a3b2..b495b1f3927 100644 --- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json @@ -11,9 +11,10 @@ "functionBreakpointPlaceholder": "Funzione per cui inserire il punto di interruzione", "functionBreakpointsNotSupported": "Punti di interruzione delle funzioni non sono supportati da questo tipo di debug", "loadMoreStackFrames": "Carica altri stack frame", - "paused": "in pausa", + "paused": "In pausa", + "pausedOn": "In pausa su {0}", "process": "Processo", - "running": "in esecuzione", + "running": "In esecuzione", "stackFrameAriaLabel": "Riga{1} {2} dello stack frame {0}, stack di chiamate, debug", "thread": "Thread", "threadAriaLabel": "Thread {0}, stack di chiamate, debug", diff --git a/i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json index 5084edd9af5..7d138b69e86 100644 --- a/i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debugConfigurationNames": "Configurazioni che verranno avviate come parte di questa configurazione \"composite\". Rispettato solo se il tipo di questa configurazione è \"composite\".", "debugLinuxConfiguration": "Attributi della configurazione di avvio specifici di Linux.", "debugName": "Nome della configurazione. Viene visualizzato nel menu a discesa della configurazione di avvio.", "debugOSXConfiguration": "Attributi della configurazione di avvio specifici di OS X.", "debugPrelaunchTask": "Attività da eseguire prima dell'avvio della sessione di debug.", "debugRequest": "Tipo della richiesta di configurazione. Può essere \"launch\" o \"attach\".", + "debugServer": "Solo per lo sviluppo dell'estensione di debug: se si specifica una porta, Visual Studio Code prova a connettersi a un adattatore di debug in esecuzione in modalità server", "debugType": "Tipo di configurazione.", "debugWindowsConfiguration": "Attributi della configurazione di avvio specifici di Windows.", "internalConsoleOptions": "Controlla il comportamento della console di debug interna.", diff --git a/i18n/ita/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json index d146adf2df8..116ff9bbcec 100644 --- a/i18n/ita/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json @@ -6,6 +6,7 @@ { "DebugConfig.failed": "Non è possibile creare il file 'launch.json' all'interno della cartella '.vscode' ({0}).", "app.launch.json.configurations": "Elenco delle configurazioni. Aggiungere nuove configurazioni o modificare quelle esistenti con IntelliSense.", + "app.launch.json.debugServer": "DEPRECATO: spostare debugServer all'interno di una configurazione.", "app.launch.json.title": "Avvia", "app.launch.json.version": "Versione di questo formato di file.", "debugNoType": "L'adattatore di debug 'type' non può essere omesso e deve essere di tipo 'string'.", diff --git a/i18n/ita/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json b/i18n/ita/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json new file mode 100644 index 00000000000..2a43886db18 --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.noMatchingProviderId": "Non è stato registrato alcun elemento TreeExplorerNodeProvider con ID {providerId}." +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json new file mode 100644 index 00000000000..7ae5c18022e --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "vscode.extension.contributes.explorer.icon": "Percorso dell'icona del viewlet sulla barra attività", + "vscode.extension.contributes.explorer.treeExplorerNodeProviderId": "ID univoco usato per identificare il provider registrato tramite vscode.workspace.registerTreeExplorerNodeProvider" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json new file mode 100644 index 00000000000..457c99c4181 --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "disable": "Disabilita", + "enable": "Abilita", + "view": "Visualizza" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json new file mode 100644 index 00000000000..324ed325042 --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "refresh": "Aggiorna" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/ita/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json new file mode 100644 index 00000000000..68f6ea0b6d6 --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "Unknown Dependency": "Dipendenza sconosciuta:", + "error": "Errore" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json new file mode 100644 index 00000000000..eeb9b598ab4 --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json @@ -0,0 +1,39 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "JSON Validation": "Convalida JSON ({0})", + "changelog": "Log delle modifiche", + "command name": "Nome", + "commands": "Comandi ({0})", + "contributions": "Contributi", + "debugger name": "Nome", + "debuggers": "Debugger ({0})", + "default": "Predefinita", + "dependencies": "Dipendenze", + "description": "Descrizione", + "details": "Dettagli", + "extension id": "Identificatore dell'estensione", + "file extensions": "Estensioni di file", + "grammar": "Grammatica", + "install count": "Conteggio delle installazioni", + "keyboard shortcuts": "Tasti di scelta rapida", + "language id": "ID", + "language name": "Nome", + "languages": "Linguaggi ({0})", + "license": "Licenza", + "menuContexts": "Contesti menu", + "name": "Nome dell'estensione", + "noChangelog": "Changelog non disponibile.", + "noContributions": "Nessun contributo", + "noDependencies": "Nessuna dipendenza", + "noReadme": "File LEGGIMI non disponibile.", + "publisher": "Nome dell'editore", + "rating": "Valutazione", + "setting name": "Nome", + "settings": "Impostazioni ({0})", + "snippets": "Frammenti", + "themes": "Temi ({0})" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json new file mode 100644 index 00000000000..23b849ad73c --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "close": "Chiudi", + "neverShowAgain": "Non visualizzare più questo messaggio", + "reallyRecommended": "È consigliabile installare l'estensione '{0}'.", + "showRecommendations": "Mostra gli elementi consigliati", + "workspaceRecommended": "Per questa area di lavoro sono disponibili estensioni consigliate." +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json new file mode 100644 index 00000000000..c3fb4c18871 --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json @@ -0,0 +1,38 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "ConfigureWorkspaceRecommendations.noWorkspace": "Gli elementi consigliati sono disponibili solo per una cartella dell'area di lavoro.", + "OpenExtensionsFile.failed": "Non è possibile creare il file 'extensions.json' all'interno della cartella '.vscode' ({0}).", + "Uninstalling": "Disinstallazione", + "builtin": "Predefinita", + "clearExtensionsInput": "Cancella input estensioni", + "configureWorkspaceRecommendedExtensions": "Configura estensioni consigliate (area di lavoro)", + "disableAction": "Disabilita", + "disableAlwaysAction.label": "Disabilita", + "disableForWorkspaceAction": "Area di lavoro", + "disableForWorkspaceAction.label": "Disabilita (area di lavoro)", + "disableGloballyAction": "Sempre", + "enableAction": "Abilita", + "enableAlwaysAction.label": "Abilita", + "enableForWorkspaceAction": "Area di lavoro", + "enableForWorkspaceAction.label": "Abilita (area di lavoro)", + "enableGloballyAction": "Sempre", + "installAction": "Installa", + "installExtensions": "Installa estensioni", + "installing": "Installazione", + "postUninstallTooltip": "Ricaricare per disattivare", + "reloadAction": "Ricarica", + "showDisabledExtensions": "Mostra estensioni disabilitate", + "showInstalledExtensions": "Mostra estensioni installate", + "showOutdatedExtensions": "Mostra estensioni obsolete", + "showPopularExtensions": "Mostra estensioni più richieste", + "showRecommendedExtensions": "Mostra estensioni consigliate", + "showWorkspaceRecommendedExtensions": "Mostra estensioni consigliate per l'area di lavoro", + "toggleExtensionsViewlet": "Mostra estensioni", + "uninstallAction": "Disinstalla", + "updateAction": "Aggiorna", + "updateAll": "Aggiorna tutte le estensioni" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json new file mode 100644 index 00000000000..0ea7de6cf90 --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "manage": "Premere INVIO per gestire le estensioni.", + "noExtensionsToInstall": "Digitare un nome di estensione", + "searchFor": "Premere INVIO per cercare '{0}' nel Marketplace." +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json new file mode 100644 index 00000000000..a16cb7f205c --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "app.extension.identifier.errorMessage": "Formato imprevisto '${publisher}.${name}'. Esempio: 'vscode.csharp'.", + "app.extensions.json.recommendations": "Elenco delle estensioni consigliate. L'identificatore di un'estensione è sempre '${publisher}.${name}'. Ad esempio: 'vscode.csharp'.", + "app.extensions.json.title": "Estensioni" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json new file mode 100644 index 00000000000..3c69400e888 --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionsInputName": "Estensione: {0}" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json index 655422321f2..1f02be40863 100644 --- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json @@ -4,49 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "ConfigureWorkspaceRecommendations.noWorkspace": "Gli elementi consigliati sono disponibili solo per una cartella dell'area di lavoro.", - "OpenExtensionsFile.failed": "Non è possibile creare il file 'extensions.json' all'interno della cartella '.vscode' ({0}).", - "Uninstalling": "Disinstallazione", - "builtin": "Predefinita", - "clearExtensionsInput": "Cancella input estensioni", - "configureWorkspaceRecommendedExtensions": "Configura estensioni consigliate (area di lavoro)", - "disableAction": "Disabilita", - "disableAll": "Disabilita tutto", - "disableAllWorkspace": "Disabilita tutto (area di lavoro)", - "disableAlwaysAction.label": "Disabilita", - "disableForWorkspaceAction": "Area di lavoro", - "disableForWorkspaceAction.label": "Disabilita (area di lavoro)", - "disableGloballyAction": "Sempre", - "enableAction": "Abilita", - "enableAll": "Abilita tutto", - "enableAllWorkspace": "Abilita tutto (area di lavoro)", - "enableAlwaysAction.label": "Abilita", - "enableForWorkspaceAction": "Area di lavoro", - "enableForWorkspaceAction.label": "Abilita (area di lavoro)", - "enableGloballyAction": "Sempre", - "installAction": "Installa", - "installExtensions": "Installa estensioni", + "InstallVSIXAction.reloadNow": "Ricarica ora", + "InstallVSIXAction.success": "L'estensione è stata installata. Riavviare per abilitarla.", "installVSIX": "Installa da VSIX...", - "installing": "Installazione", - "openExtensionsFolder": "Apri cartella estensioni", - "postDisableMessage": "Ricaricare questa finestra per disabilitare l'estensione '{0}'?", - "postDisableTooltip": "Ricaricare per disabilitare", - "postEnableMessage": "Ricaricare questa finestra per abilitare l'estensione '{0}'?", - "postEnableTooltip": "Ricaricare per abilitare", - "postInstallMessage": "Ricaricare questa finestra per attivare l'estensione '{0}'?", - "postInstallTooltip": "Ricaricare per attivare", - "postUninstallMessage": "Ricaricare questa finestra per disattivare l'estensione '{0}'?", - "postUninstallTooltip": "Ricaricare per disattivare", - "reloadAction": "Ricarica", - "reloadNow": "Ricarica ora", - "showDisabledExtensions": "Mostra estensioni disabilitate", - "showInstalledExtensions": "Mostra estensioni installate", - "showOutdatedExtensions": "Mostra estensioni obsolete", - "showPopularExtensions": "Mostra estensioni più richieste", - "showRecommendedExtensions": "Mostra estensioni consigliate", - "showWorkspaceRecommendedExtensions": "Mostra estensioni consigliate per l'area di lavoro", - "toggleExtensionsViewlet": "Mostra estensioni", - "uninstallAction": "Disinstalla", - "updateAction": "Aggiorna", - "updateAll": "Aggiorna tutte le estensioni" + "openExtensionsFolder": "Apri cartella estensioni" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json index 076cd71bf0c..ac052cbe9e2 100644 --- a/i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json @@ -20,6 +20,7 @@ "files.exclude.when": "Controllo aggiuntivo sugli elementi di pari livello di un file corrispondente. Usare $(basename) come variabile del nome file corrispondente.", "filesConfigurationTitle": "File", "formatOnSave": "Formatta un file durante il salvataggio. Deve essere disponibile un formattatore, il file non deve essere salvato automaticamente e l'editor non deve essere in fase di chiusura.", + "insertFinalNewline": "Se è abilitato, inserisce un carattere di nuova riga finale alla fine del file durante il salvataggio.", "openEditorsVisible": "Numero di editor visualizzati nel riquadro degli editor aperti. Impostarlo su 0 per nascondere il riquadro.", "showExplorerViewlet": "Mostra Esplora risorse", "textFileEditor": "Editor file di testo", diff --git a/i18n/ita/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/ita/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json index 91b34c2e1b1..648ad816459 100644 --- a/i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "errors.warnings.show.label": "Errori e avvisi", + "errors.warnings.show.label": "Mostra errori e avvisi", "markers.panel.action.filter": "Filtra problemi", "markers.panel.aria.label.problems.tree": "Problemi raggruppati per file", "markers.panel.at.ln.col.number": "({0}, {1})", @@ -25,15 +25,15 @@ "markers.panel.title.problems": "Problemi", "problems.panel.configuration.autoreveal": "Controlla se la visualizzazione Problemi deve visualizzare automaticamente i file durante l'apertura", "problems.panel.configuration.title": "Visualizzazione Problemi", - "problems.tree.aria.label.error.marker": "Errore generato da {0}: {1} a riga {2} e colonna {3}", - "problems.tree.aria.label.error.marker.nosource": "Errore: {0} a riga {1} e colonna {2}", - "problems.tree.aria.label.info.marker": "Messaggio informativo generato da {0}: {1} a riga {2} e colonna {3}", - "problems.tree.aria.label.info.marker.nosource": "Messaggio informativo: {0} a riga {1} e colonna {2}", - "problems.tree.aria.label.marker": "Problema generato da {0}: {1} a riga {2} e colonna {3}", - "problems.tree.aria.label.marker.nosource": "Problema: {0} a riga {1} e colonna {2}", + "problems.tree.aria.label.error.marker": "Errore generato da {0}: {1} a riga {2} e carattere {3}", + "problems.tree.aria.label.error.marker.nosource": "Errore: {0} a riga {1} e carattere {2}", + "problems.tree.aria.label.info.marker": "Messaggio informativo generato da {0}: {1} a riga {2} e carattere {3}", + "problems.tree.aria.label.info.marker.nosource": "Messaggio informativo: {0} a riga {1} e carattere {2}", + "problems.tree.aria.label.marker": "Problema generato da {0}: {1} a riga {2} e carattere {3}", + "problems.tree.aria.label.marker.nosource": "Problema: {0} a riga {1} e carattere {2}", "problems.tree.aria.label.resource": "{0} con {1} problemi", - "problems.tree.aria.label.warning.marker": "Avviso generato da {0}: {1} a riga {2} e colonna {3}", - "problems.tree.aria.label.warning.marker.nosource": "Avviso: {0} a riga {1} e colonna {2}", + "problems.tree.aria.label.warning.marker": "Avviso generato da {0}: {1} a riga {2} e carattere {3}", + "problems.tree.aria.label.warning.marker.nosource": "Avviso: {0} a riga {1} e carattere {2}", "problems.view.show.label": "Mostra problemi", "viewCategory": "Visualizza" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json new file mode 100644 index 00000000000..50cc6423757 --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "neverAgain": "Non visualizzare più questo messaggio", + "remindLater": "Visualizza più tardi", + "surveyQuestion": "Partecipare a un breve sondaggio?", + "takeSurvey": "Partecipa a sondaggio" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json index 5e1be74a7e3..c595b9a7f52 100644 --- a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json @@ -26,11 +26,11 @@ "JsonSchema.options.env": "Ambiente della shell o del programma eseguito. Se omesso, viene usato l'ambiente del processo padre.", "JsonSchema.pattern.code": "Indice del gruppo di corrispondenze del codice del problema. Il valore predefinito è undefined", "JsonSchema.pattern.column": "Indice del gruppo di corrispondenze della colonna del problema. Il valore predefinito è 3", - "JsonSchema.pattern.endColumn": "Indice del gruppo di corrispondenze della colonna finale del problema. Il valore predefinito è undefined", + "JsonSchema.pattern.endColumn": "Indice del gruppo di corrispondenze del carattere di fine riga del problema. Il valore predefinito è undefined", "JsonSchema.pattern.endLine": "Indice del gruppo di corrispondenze della riga finale del problema. Il valore predefinito è undefined", "JsonSchema.pattern.file": "Indice del gruppo di corrispondenze del nome file. Se omesso, viene usato 1.", "JsonSchema.pattern.line": "Indice del gruppo di corrispondenze della riga del problema. Il valore predefinito è 2", - "JsonSchema.pattern.location": "Indice del gruppo di corrispondenze della posizione del problema. I criteri di posizione validi sono: (line), (line,column) e (startLine,startColumn,endLine,endColumn). Se omesso, si presuppone che sia impostato su line e column.", + "JsonSchema.pattern.location": "Indice del gruppo di corrispondenze della posizione del problema. I criteri di posizione validi sono: (line), (line,column) e (startLine,startColumn,endLine,endColumn). Se omesso, si presuppone che sia impostato su (line,column).", "JsonSchema.pattern.loop": "In un matcher di più righe il ciclo indica se questo criterio viene eseguito in un ciclo finché esiste la corrispondenza. Può essere specificato solo come ultimo criterio in un criterio su più righe.", "JsonSchema.pattern.message": "Indice del gruppo di corrispondenze del messaggio. Se omesso, il valore predefinito è 4 se si specifica la posizione; in caso contrario, il valore predefinito è 5.", "JsonSchema.pattern.regexp": "Espressione regolare per trovare un messaggio di tipo errore, avviso o info nell'output.", diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json index ca45d647942..59c147fff97 100644 --- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "terminal.integrated.copySelection.noSelection": "Non è possibile copiare la selezione del terminale quando questo non ha lo stato attivo", - "terminal.integrated.exitedWithCode": "Il processo del terminale è stato terminato. Codice di uscita: {0}" + "terminal.integrated.exitedWithCode": "Il processo del terminale è stato terminato. Codice di uscita: {0}", + "terminal.integrated.launchFailed": "L'avvio del comando del processo di terminale `{0}{1}` non è riuscito. Codice di uscita: {2}" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json index 556aff6dba8..c802cf8f2df 100644 --- a/i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json +++ b/i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "errorConfigurationFileDirty": "Non è possibile scrivere le impostazioni perché il file stato modificato ma non salvato. Salvare il file delle **Impostazioni utente** e riprovare.", + "errorConfigurationFileDirty": "Non è possibile scrivere le impostazioni perché il file è stato modificato ma non salvato. Salvare il file delle **Impostazioni utente** e riprovare.", "errorConfigurationFileDirtyWorkspace": "Non è possibile scrivere le impostazioni perché il file stato modificato ma non salvato. Salvare il file delle **Impostazioni area di lavoro** e riprovare.", "errorInvalidConfiguration": "Non è possibile scrivere le impostazioni. Aprire **Impostazioni utente** per correggere errori/avvisi nel file e riprovare.", "errorInvalidConfigurationWorkspace": "Non è possibile scrivere le impostazioni. Aprire **Impostazioni area di lavoro** per correggere errori/avvisi nel file e riprovare.", diff --git a/i18n/ita/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/ita/src/vs/workbench/services/message/browser/messageList.i18n.json new file mode 100644 index 00000000000..2f84bc13d34 --- /dev/null +++ b/i18n/ita/src/vs/workbench/services/message/browser/messageList.i18n.json @@ -0,0 +1,14 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "alertErrorMessage": "Errore: {0}", + "alertInfoMessage": "Info: {0}", + "alertWarningMessage": "Avviso: {0}", + "close": "Chiudi", + "error": "Errore", + "info": "Informazioni", + "warning": "Avviso" +} \ No newline at end of file diff --git a/i18n/jpn/extensions/typescript/package.i18n.json b/i18n/jpn/extensions/typescript/package.i18n.json index 3124f4179e1..1eb275956da 100644 --- a/i18n/jpn/extensions/typescript/package.i18n.json +++ b/i18n/jpn/extensions/typescript/package.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "configuration.typescript": "TypeScript。", + "configuration.typescript": "TypeScript", "format.insertSpaceAfterCommaDelimiter": "コンマ区切り記号の後のスペース処理を定義します。", "format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "匿名関数の関数キーワードの後のスペース処理を定義します。", "format.insertSpaceAfterKeywordsInControlFlowStatements": "制御フロー ステートメント内のキーワードの後のスペース処理を定義します。", diff --git a/i18n/jpn/src/vs/code/electron-main/menus.i18n.json b/i18n/jpn/src/vs/code/electron-main/menus.i18n.json index 897e1e5c447..691965a8c5e 100644 --- a/i18n/jpn/src/vs/code/electron-main/menus.i18n.json +++ b/i18n/jpn/src/vs/code/electron-main/menus.i18n.json @@ -46,14 +46,15 @@ "miGotoLine": "行に移動(&&L)...", "miGotoSymbolInFile": "ファイル内のシンボルへ移動(&&S)...", "miGotoSymbolInWorkspace": "ワークスペース内のシンボルへ移動(&&W)...", + "miHideActivityBar": "&&アクティビティ バーを非表示にする", "miHideStatusbar": "ステータス バーを非表示にする(&&H)", "miInstallingUpdate": "更新プログラムをインストールしています...", "miIntroductoryVideos": "紹介ビデオ(&&V)", "miKeyboardShortcuts": "キーボード ショートカットの参照(&&K)", "miLicense": "ライセンスの表示(&&L)", "miMarker": "問題(&&P)", - "miMoveSidebarLeft": "サイドバーを左へ移動(&&M)", - "miMoveSidebarRight": "サイドバーを右へ移動(&&M)", + "miMoveSidebarLeft": "サイド バーを左へ移動(&&M)", + "miMoveSidebarRight": "サイド バーを右へ移動(&&M)", "miNewFile": "新規ファイル(&&N)", "miNewWindow": "新しいウィンドウ(&&N)", "miNextEditor": "次のエディター(&&N)", @@ -88,6 +89,7 @@ "miSelectAll": "すべて選択(&&S)", "miSelectColorTheme": "配色テーマ(&&C)", "miSelectIconTheme": "ファイル アイコンのテーマ(&&I)", + "miShowActivityBar": "&&アクティビティ バーを表示する", "miShowStatusbar": "ステータス バーの表示(&&S)", "miSplitEditor": "エディターを分割(&&E)", "miSwitchEditor": "エディターの切り替え(&&E)", diff --git a/i18n/jpn/src/vs/code/electron-main/windows.i18n.json b/i18n/jpn/src/vs/code/electron-main/windows.i18n.json index 1cff51d83fc..2ffef4d57ad 100644 --- a/i18n/jpn/src/vs/code/electron-main/windows.i18n.json +++ b/i18n/jpn/src/vs/code/electron-main/windows.i18n.json @@ -10,10 +10,14 @@ "appStalled": "ウィンドウから応答がありません", "appStalledDetail": "ウィンドウを再度開くか、閉じるか、このまま待機できます。", "close": "閉じる", + "folderDesc": "{0} {1}", "hiddenMenuBar": "引き続き **Alt** キーを押してメニュー バーにアクセスできます。", + "newWindow": "新しいウィンドウ", + "newWindowDesc": "新しいウィンドウを開く", "ok": "OK", "pathNotExistDetail": "パス '{0}' はディスクに存在しなくなったようです。", "pathNotExistTitle": "パスが存在しません", + "recentFolders": "最近使用したフォルダー", "reopen": "もう一度開く", "wait": "待機を続ける" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/jpn/src/vs/editor/common/services/modelServiceImpl.i18n.json index 658929e91c6..2c0ec0d1d6b 100644 --- a/i18n/jpn/src/vs/editor/common/services/modelServiceImpl.i18n.json +++ b/i18n/jpn/src/vs/editor/common/services/modelServiceImpl.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "diagAndSource": "[{0}] {1}", + "diagAndSourceMultiline": "[{0}]\n{1}", "indentAutoMigrate": "設定を更新してください: `editor.detectIndentation` は `editor.tabSize`: \"auto\" または `editor.insertSpaces`: \"auto\" を置き換えます" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json index 97aeb64add3..1a79a138263 100644 --- a/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json +++ b/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json @@ -6,7 +6,7 @@ { "actions.goToDecl.label": "定義へ移動", "actions.goToDeclToSide.label": "定義を横に開く", - "actions.previewDecl.label": "ピークの定義", + "actions.previewDecl.label": "定義をここに表示", "meta.title": " - {0} の定義", "multipleResults": "クリックして、{0} の定義を表示します。" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/jpn/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json new file mode 100644 index 00000000000..982fac8c67f --- /dev/null +++ b/i18n/jpn/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json @@ -0,0 +1,19 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "parseErrors": "{0} を解析中のエラー: {1}", + "schema.autoClosingPairs": "角かっこのペアを定義します。左角かっこが入力されると、右角かっこが自動的に挿入されます。", + "schema.autoClosingPairs.notIn": "自動ペアが無効なスコープの一覧を定義します。", + "schema.blockComment.begin": "ブロック コメントを開始する文字シーケンス。", + "schema.blockComment.end": "ブロック コメントを終了する文字シーケンス。", + "schema.blockComments": "ブロック コメントのマーク方法を定義します。", + "schema.brackets": "インデントを増減する角かっこを定義します。", + "schema.closeBracket": "右角かっこまたは文字列シーケンス。", + "schema.comments": "コメント記号を定義します。", + "schema.lineComment": "行コメントを開始する文字シーケンス。", + "schema.openBracket": "左角かっこまたは文字列シーケンス。", + "schema.surroundingPairs": "選択文字列を囲むときに使用できる角かっこのペアを定義します。" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/jpn/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json new file mode 100644 index 00000000000..1147f8c5966 --- /dev/null +++ b/i18n/jpn/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noWorkspace": "ワークスペースがありません。" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/platform/extensions/common/extensionsRegistry.i18n.json b/i18n/jpn/src/vs/platform/extensions/common/extensionsRegistry.i18n.json index 1eedafd7c54..f699bbbc285 100644 --- a/i18n/jpn/src/vs/platform/extensions/common/extensionsRegistry.i18n.json +++ b/i18n/jpn/src/vs/platform/extensions/common/extensionsRegistry.i18n.json @@ -18,7 +18,7 @@ "vscode.extension.galleryBanner.color": "VS Code マーケットプレース ページ ヘッダー上のバナーの色。", "vscode.extension.galleryBanner.theme": "バナーで使用されるフォントの配色テーマ。", "vscode.extension.icon": "128x128 ピクセルのアイコンへのパス。", - "vscode.extension.preview": "Marketplace で Preview としてフラグを付けられる拡張機能を設定します。", + "vscode.extension.preview": "Marketplace で Preview としてフラグが付けられるように拡張機能を設定します。", "vscode.extension.publisher": "VS Code 拡張機能の公開元。", "vscode.extension.scripts.prepublish": "パッケージが VS Code 拡張機能として公開される前に実行されるスクリプト。" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/platform/request/node/request.i18n.json b/i18n/jpn/src/vs/platform/request/node/request.i18n.json new file mode 100644 index 00000000000..b01113defe4 --- /dev/null +++ b/i18n/jpn/src/vs/platform/request/node/request.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "httpConfigurationTitle": "HTTP", + "proxy": "使用するプロキシ設定。設定されていない場合、環境変数 http_proxy および https_proxy から取得されます。", + "proxyAuthorization": "すべてのネットワーク要求に対して 'Proxy-Authorization' ヘッダーとして送信する値。", + "strictSSL": "提供された CA の一覧と照らしてプロキシ サーバーの証明書を確認するかどうか。" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/jpn/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json new file mode 100644 index 00000000000..2de1dabe248 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider '{0}' がルート ノードの指定に失敗しました。", + "treeExplorer.failedToResolveChildren": "TreeExplorerNodeProvider '{0}' が子の解決に失敗しました。", + "treeExplorer.notRegistered": "ID '{0}' の TreeExplorerNodeProvider は登録されていません。" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/jpn/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json new file mode 100644 index 00000000000..d203480e3eb --- /dev/null +++ b/i18n/jpn/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionUnderDevelopment": "開発の拡張機能を {0} に読み込んでいます", + "overwritingExtension": "拡張機能 {0} を {1} で上書きしています。" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json new file mode 100644 index 00000000000..c9b5a419e88 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "toggleActivityBar": "アクティビティ バーの表示の切り替え", + "view": "表示" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index 1187daed7fe..8588b7e6f53 100644 --- a/i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -6,8 +6,8 @@ { "allEditorsPicker": "開いているエディターをすべて表示する", "binaryDiffEditor": "バイナリ差分エディター", - "groupOnePicker": "最初のグループでエディターを表示する", - "groupThreePicker": "3 番目のグループでエディターを表示する", + "groupOnePicker": "最初のグループのエディターを表示する", + "groupThreePicker": "3 番目のグループのエディターを表示する", "groupTwoPicker": "2 番目のグループでエディターを表示する", "textDiffEditor": "テキスト差分エディター", "textEditor": "テキスト エディター", diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json index 9d2ab11a4a1..80263bee4f1 100644 --- a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json +++ b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json @@ -40,9 +40,9 @@ "openToSide": "横に並べて開く", "reopenClosedEditor": "閉じたエディターを再度開く", "showAllEditors": "すべてのエディターを表示する", - "showEditorsInFirstGroup": "最初のグループでエディターを表示する", + "showEditorsInFirstGroup": "最初のグループのエディターを表示する", "showEditorsInGroup": "エディターをグループに表示する", "showEditorsInSecondGroup": "2 番目のグループでエディターを表示する", - "showEditorsInThirdGroup": "3 番目のグループでエディターを表示する", + "showEditorsInThirdGroup": "3 番目のグループのエディターを表示する", "splitEditor": "エディターの分割" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/panel/panelPart.i18n.json index fbe21ef959a..6207ece9206 100644 --- a/i18n/jpn/src/vs/workbench/browser/parts/panel/panelPart.i18n.json +++ b/i18n/jpn/src/vs/workbench/browser/parts/panel/panelPart.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closePanel": "閉じる", + "closePanel": "パネルを閉じる", "focusPanel": "パネルにフォーカスする", "toggleMaximizedPanel": "最大化されるパネルの切り替え", "togglePanel": "パネルの切り替え", diff --git a/i18n/jpn/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json index 6924623e72d..dfaf7b08de1 100644 --- a/i18n/jpn/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json +++ b/i18n/jpn/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json @@ -13,5 +13,5 @@ "noResultsFound1": "一致する項目はありません", "pickHistory": "履歴から削除するエディター エントリを選ぶ", "quickOpenInput": "'?' と入力すると、ここで実行できる処理に関するヘルプが表示されます", - "removeFromEditorHistory": "エディター履歴から削除する" + "removeFromEditorHistory": "履歴から削除" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json index 3c55a0de8c5..ef7f6835eaa 100644 --- a/i18n/jpn/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json +++ b/i18n/jpn/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json @@ -4,5 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "canNotRun": "コマンド '{0}' はここからは実行できません。" + "canNotRun": "コマンド '{0}' は現在有効ではなく、実行できません。" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/extensionHost.i18n.json new file mode 100644 index 00000000000..c36259ccb43 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/electron-browser/extensionHost.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionHostProcess.crash": "拡張機能ホストが予期せずに終了しました。回復するには、ウィンドウを再度読み込んでください。", + "extensionHostProcess.error": "拡張機能ホストからのエラー: {0}", + "extensionHostProcess.startupFail": "拡張機能ホストが 10 秒以内に開始されませんでした。問題が発生している可能性があります。", + "extensionHostProcess.startupFailDebug": "拡張機能ホストが 10 秒以内に開始されませんでした。先頭行で停止している可能性があり、続行するにはデバッガーが必要です。" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/electron-browser/integration.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/integration.i18n.json index 7a5e0a25566..b606382083a 100644 --- a/i18n/jpn/src/vs/workbench/electron-browser/integration.i18n.json +++ b/i18n/jpn/src/vs/workbench/electron-browser/integration.i18n.json @@ -6,10 +6,8 @@ { "copy": "コピー", "cut": "切り取り", - "files": "ファイル", - "folders": "フォルダー", - "openRecentPlaceHolder": "パスを選択して開く (Ctrl キーを押しながら新しいウィンドウで開く)", - "openRecentPlaceHolderMac": "パスを選択 (Cmd キーを押しながら新しいウィンドウで開く)", + "developer": "開発者", + "file": "ファイル", "paste": "貼り付け", "redo": "やり直し", "selectAll": "すべて選択", diff --git a/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json index dbcaeffe724..5d76421ce30 100644 --- a/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json +++ b/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "activityBarVisibility": "ワークベンチでのアクティビティ バーの表示をコントロールします。", "closeOnFocusLost": "フォーカスを失ったときに Quick Open を自動的に閉じるかどうかを制御します。", - "developer": "開発者", "editorOpenPositioning": "エディターを開く場所を制御します。[左] または [右] を選択して、現在アクティブになっているエディターの左または右にエディターを開きます。[最初] または [最後] を選択して、現在アクティブになっているエディターとは別個にエディターを開きます。", "enablePreview": "開いているエディターをプレビューとして表示するかどうかを制御します。プレビュー エディターは、保持されている間、再利用されます (ダブルクリックまたは編集などによって)。", "enablePreviewFromQuickOpen": "Quick Open で開いたエディターをプレビューとして表示するかどうかを制御します。プレビュー エディターは、保持されている間、再利用されます (ダブルクリックまたは編集などによって)。", @@ -15,12 +15,13 @@ "openFilesInNewWindow": "有効にすると、既存のインスタンスを再利用せずに新しいウィンドウでファイルを開きます。", "reopenFolders": "再起動後にフォルダーを再度開く方法を制御します。'none' を選択するとフォルダーを再度開くことはありません。'one' を選択すると最後に作業したフォルダーを再度開きます。'all' を選択すると前回のセッションのフォルダーすべてを再度開きます。", "restoreFullscreen": "全画面表示モードで終了した場合に、ウィンドウを全画面表示モードに復元するかどうかを制御します。", + "showEditorTabCloseButton": "エディターのタブに閉じるボタンを表示するかどうかをコントロールします。", "showEditorTabs": "開いているエディターをタブに表示するかどうかを制御します。", + "showFullPath": "有効な場合、開いているファイルの完全なパスがウィンドウのタイトルに表示されます。", "showIcons": "開いているエディターをアイコンで表示するかどうかを制御します。これには、アイコンのテーマを有効にする必要もあります。", "sideBarLocation": "サイド バーの位置を制御します。ワークベンチの左右のいずれかに表示できます。", "statusBarVisibility": "ワークベンチの下部にステータス バーを表示するかどうかを制御します。", - "updateChannel": "更新チャネルから自動更新を受信するかどうかを構成します。変更後に再起動が必要です。", - "updateConfigurationTitle": "更新", + "titleBarStyle": "ウィンドウのタイトル バーの外観を調整します。変更を適用するには、完全に再起動する必要があります。", "view": "表示", "windowConfigurationTitle": "ウィンドウ", "workbenchConfigurationTitle": "ワークベンチ", diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json index 5f3f133b180..f3eed498cbd 100644 --- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json @@ -10,18 +10,16 @@ "addToWatchExpressions": "ウォッチに追加", "addWatchExpression": "式の追加", "clearRepl": "コンソールのクリア", - "conditionalBreakpointEditorAction": "デバッグ: 条件付きブレークポイントの追加...", "continueDebug": "続行", "deactivateBreakpoints": "ブレークポイントの非アクティブ化", - "debugAddToWatch": "デバッグ: ウォッチに追加", "debugConsoleAction": "デバッグ コンソール", - "debugEvaluate": "デバッグ: 評価", "debugFocusConsole": "デバッグ コンソールにフォーカスを移動", "disableAllBreakpoints": "すべてのブレークポイントを無効にする", "disconnectDebug": "切断", "editConditionalBreakpoint": "ブレークポイントの編集...", "editWatchExpression": "式の編集", "enableAllBreakpoints": "すべてのブレークポイントを有効にする", + "focusProcess": "フォーカスのプロセス", "launchJsonNeedsConfigurtion": "'launch.json' を構成または修正してください", "openLaunchJson": "{0} を開く", "pauseDebug": "一時停止", @@ -34,10 +32,9 @@ "renameFunctionBreakpoint": "関数ブレークポイントの名前変更", "restartDebug": "再起動", "restartFrame": "フレームの再起動", - "runToCursor": "デバッグ: カーソル行の前まで実行", + "reverseContinue": "反転", "selectConfig": "構成の選択", "setValue": "値の設定", - "showDebugHover": "デバッグ: ホバーの表示", "startDebug": "デバッグの開始", "startWithoutDebugging": "デバッグなしで開始", "stepBackDebug": "1 つ戻る", @@ -45,7 +42,6 @@ "stepOutDebug": "ステップ アウト", "stepOverDebug": "ステップ オーバー", "stopDebug": "停止", - "toggleBreakpointAction": "デバッグ: ブレークポイントの切り替え", "toggleEnablement": "ブレークポイントの有効化/無効化", "unreadOutput": "デバッグ コンソールでの新しい出力" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json new file mode 100644 index 00000000000..947cf23a418 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json @@ -0,0 +1,13 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "conditionalBreakpointEditorAction": "デバッグ: 条件付きブレークポイントの追加...", + "debugAddToWatch": "デバッグ: ウォッチに追加", + "debugEvaluate": "デバッグ: 評価", + "runToCursor": "デバッグ: カーソル行の前まで実行", + "showDebugHover": "デバッグ: ホバーの表示", + "toggleBreakpointAction": "デバッグ: ブレークポイントの切り替え" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/common/debug.i18n.json new file mode 100644 index 00000000000..fcb98834ee1 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/debug/common/debug.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noConfigurations": "構成がありません" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json index 20378313a94..1ef734fa792 100644 --- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json @@ -12,8 +12,9 @@ "functionBreakpointsNotSupported": "このデバッグの種類では関数ブレークポイントはサポートされていません", "loadMoreStackFrames": "スタック フレームをさらに読み込む", "paused": "一時停止", + "pausedOn": "{0} で一時停止", "process": "プロセス", - "running": "実行中", + "running": "実行しています", "stackFrameAriaLabel": "スタック フレーム {0} 行 {1} {2}、呼び出しスタック、デバッグ", "thread": "スレッド", "threadAriaLabel": "スレッド {0}、呼び出しスタック、デバッグ", diff --git a/i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json index 9314ade3838..28b049bae70 100644 --- a/i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debugConfigurationNames": "この \"コンポジット\" 構成の一部として起動される構成。この構成の種類が \"コンポジット\" の場合にのみ有効です。", "debugLinuxConfiguration": "Linux 固有の起動構成の属性。", "debugName": "構成の名前。起動構成のドロップダウン メニューに表示されます。", "debugOSXConfiguration": "OS X 固有の起動構成の属性。", "debugPrelaunchTask": "デバッグ セッションの開始前に実行するタスク。", "debugRequest": "構成の要求の種類。\"launch\" または \"attach\" です。", + "debugServer": "デバッグ拡張機能の開発のみ。ポートが指定の VS Code の場合、サーバー モードで実行中のデバッグ アダプターへの接続が試行されます。", "debugType": "構成の種類。", "debugWindowsConfiguration": "Windows 固有の起動構成の属性。", "internalConsoleOptions": "内部デバッグ コンソールの動作を制御します。", diff --git a/i18n/jpn/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json index 6c0a15c128a..9618e3fdb8e 100644 --- a/i18n/jpn/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json @@ -6,6 +6,7 @@ { "DebugConfig.failed": "'launch.json' ファイルを '.vscode' フォルダー ({0}) 内に作成できません。", "app.launch.json.configurations": "構成の一覧。IntelliSense を使用して、新しい構成を追加したり、既存の構成を編集したります。", + "app.launch.json.debugServer": "非推奨: debugServer を構成内に移動してください。", "app.launch.json.title": "起動", "app.launch.json.version": "このファイル形式のバージョン。", "debugNoType": "デバッグ アダプター 'type' は省略不可で、型 'string' でなければなりません。", diff --git a/i18n/jpn/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json b/i18n/jpn/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json new file mode 100644 index 00000000000..63e24172325 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.noMatchingProviderId": "ID {providerId} の TreeExplorerNodeProvider は登録されていません。" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json new file mode 100644 index 00000000000..d49f0a88d3b --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.invalidId": "ツリー エクスプローラー拡張 {0} に無効な ID があり、アクティブ化できませんでした。", + "vscode.extension.contributes.explorer": "カスタム ツリー エクスプローラー Viewlet をサイドバーに追加します", + "vscode.extension.contributes.explorer.icon": "アクティビティ バーの Viewlet アイコンへのパス", + "vscode.extension.contributes.explorer.treeExplorerNodeProviderId": "vscode.workspace.registerTreeExplorerNodeProvider を介して登録したプロバイダーを識別するための一意の ID", + "vscode.extension.contributes.explorer.treeLabel": "カスタム ツリー エクスプローラーの表示に使用される、人が判別できる文字列" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json new file mode 100644 index 00000000000..61d24e7bc57 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "disable": "無効にする", + "enable": "有効にする", + "treeExplorer.toggle": "カスタム エクスプローラーの切り替え", + "view": "表示" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json new file mode 100644 index 00000000000..35740fe14c4 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "refresh": "最新の情報に更新" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/jpn/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json new file mode 100644 index 00000000000..28fa299b050 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorerViewlet.tree": "ツリー エクスプ ローラー セクション" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json new file mode 100644 index 00000000000..231c287e010 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "Unknown Dependency": "不明な依存関係:", + "error": "エラー" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json new file mode 100644 index 00000000000..51afa8e0b1e --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json @@ -0,0 +1,39 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "JSON Validation": "JSON 検証 ({0})", + "changelog": "変更ログ", + "command name": "名前", + "commands": "コマンド ({0})", + "contributions": "コントリビューション", + "debugger name": "名前", + "debuggers": "デバッガー ({0})", + "default": "既定", + "dependencies": "依存関係", + "description": "説明", + "details": "詳細", + "extension id": "拡張機能の識別子", + "file extensions": "ファイル拡張子", + "grammar": "文章校正", + "install count": "インストール数", + "keyboard shortcuts": "キーボード ショートカット(&&K)", + "language id": "ID", + "language name": "名前", + "languages": "言語 ({0})", + "license": "ライセンス", + "menuContexts": "メニュー コンテキスト", + "name": "拡張機能名", + "noChangelog": "使用可能な変更ログはありません。", + "noContributions": "コントリビューションはありません", + "noDependencies": "依存関係はありません", + "noReadme": "利用できる README はありません。", + "publisher": "発行者名", + "rating": "評価", + "setting name": "名前", + "settings": "設定 ({0})", + "snippets": "スニペット", + "themes": "テーマ ({0})" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json new file mode 100644 index 00000000000..05e65fe933b --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "close": "閉じる", + "neverShowAgain": "今後は表示しない", + "reallyRecommended": "'{0}' 拡張機能のインストールをお勧めします。", + "showRecommendations": "推奨事項を表示", + "workspaceRecommended": "このワークスペースには拡張機能の推奨事項があります。" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json new file mode 100644 index 00000000000..3e01d45afc4 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json @@ -0,0 +1,38 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "ConfigureWorkspaceRecommendations.noWorkspace": "推奨事項はワークスペース フォルダーでのみ利用可能です。", + "OpenExtensionsFile.failed": "'.vscode' ファルダー ({0}) 内に 'extensions.json' ファイルを作成できません。", + "Uninstalling": "アンインストールしています", + "builtin": "ビルトイン", + "clearExtensionsInput": "拡張機能の入力のクリア", + "configureWorkspaceRecommendedExtensions": "お勧めの拡張機能の構成 (ワークスペース)", + "disableAction": "無効にする", + "disableAlwaysAction.label": "無効にする", + "disableForWorkspaceAction": "ワークスペース", + "disableForWorkspaceAction.label": "無効にする (ワークスペース)", + "disableGloballyAction": "常に行う", + "enableAction": "有効", + "enableAlwaysAction.label": "有効にする", + "enableForWorkspaceAction": "ワークスペース", + "enableForWorkspaceAction.label": "有効にする (ワークスペース)", + "enableGloballyAction": "常に行う", + "installAction": "インストール", + "installExtensions": "拡張機能のインストール", + "installing": "インストールしています", + "postUninstallTooltip": "読み込んで非アクティブ化する", + "reloadAction": "再度読み込む", + "showDisabledExtensions": "無効な拡張機能の表示", + "showInstalledExtensions": "インストール済みの拡張機能の表示", + "showOutdatedExtensions": "古くなった拡張機能の表示", + "showPopularExtensions": "人気の拡張機能の表示", + "showRecommendedExtensions": "お勧めの拡張機能を表示", + "showWorkspaceRecommendedExtensions": "ワークスペースのおすすめの拡張機能を表示", + "toggleExtensionsViewlet": "拡張機能を表示する", + "uninstallAction": "アンインストール", + "updateAction": "更新", + "updateAll": "すべての拡張機能を更新します" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json new file mode 100644 index 00000000000..1e29e9940c1 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "manage": "拡張機能を管理するには Enter キーを押してください。", + "noExtensionsToInstall": "拡張機能名を入力してください", + "searchFor": "マーケットプレース内で '{0}' を検索するには、Enter キーを押してください。" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json new file mode 100644 index 00000000000..ad5da97400f --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "app.extension.identifier.errorMessage": "予期される形式 '${publisher}.${name}'。例: 'vscode.csharp'。", + "app.extensions.json.recommendations": "拡張機能のおすすめ候補の一覧。拡張機能の ID は常に '${publisher}.${name}' です。例: 'vscode.csharp'。", + "app.extensions.json.title": "拡張機能" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json new file mode 100644 index 00000000000..b23efacc643 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionsInputName": "拡張機能: {0}" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json index c813eaed885..e9f5205b107 100644 --- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json @@ -4,49 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "ConfigureWorkspaceRecommendations.noWorkspace": "推奨事項はワークスペース フォルダーでのみ利用可能です。", - "OpenExtensionsFile.failed": "'.vscode' ファルダー ({0}) 内に 'extensions.json' ファイルを作成できません。", - "Uninstalling": "アンインストールしています", - "builtin": "ビルトイン", - "clearExtensionsInput": "拡張機能の入力のクリア", - "configureWorkspaceRecommendedExtensions": "お勧めの拡張機能の構成 (ワークスペース)", - "disableAction": "無効にする", - "disableAll": "すべて無効にする", - "disableAllWorkspace": "すべて無効にする (ワークスペース)", - "disableAlwaysAction.label": "無効にする", - "disableForWorkspaceAction": "ワークスペース", - "disableForWorkspaceAction.label": "無効にする (ワークスペース)", - "disableGloballyAction": "常に行う", - "enableAction": "有効", - "enableAll": "すべて有効にする", - "enableAllWorkspace": "すべて有効にする (ワークスペース)", - "enableAlwaysAction.label": "有効にする", - "enableForWorkspaceAction": "ワークスペース", - "enableForWorkspaceAction.label": "有効にする (ワークスペース)", - "enableGloballyAction": "常に行う", - "installAction": "インストール", - "installExtensions": "拡張機能のインストール", + "InstallVSIXAction.reloadNow": "今すぐ再度読み込む", + "InstallVSIXAction.success": "拡張機能が正常にインストールされました。有効にするには再起動します。", "installVSIX": "VSIX からのインストール...", - "installing": "インストールしています", - "openExtensionsFolder": "拡張機能フォルダーを開く", - "postDisableMessage": "このウィンドウを再度読み込んで '{0}' 拡張機能を無効にしますか?", - "postDisableTooltip": "読み込んで無効にする", - "postEnableMessage": "このウィンドウを再度読み込んで '{0}' 拡張機能を有効にしますか?", - "postEnableTooltip": "読み込んで有効にする", - "postInstallMessage": "このウィンドウを再度読み込んで '{0}' 拡張機能をアクティブにしますか?", - "postInstallTooltip": "読み込んでアクティブにする", - "postUninstallMessage": "このウィンドウを再度読み込んで '{0}' 拡張機能を非アクティブ化しますか?", - "postUninstallTooltip": "読み込んで非アクティブ化する", - "reloadAction": "再度読み込む", - "reloadNow": "今すぐ再度読み込む", - "showDisabledExtensions": "無効な拡張機能の表示", - "showInstalledExtensions": "インストール済みの拡張機能の表示", - "showOutdatedExtensions": "古くなった拡張機能の表示", - "showPopularExtensions": "人気の拡張機能の表示", - "showRecommendedExtensions": "お勧めの拡張機能を表示", - "showWorkspaceRecommendedExtensions": "ワークスペースのおすすめの拡張機能を表示", - "toggleExtensionsViewlet": "拡張機能を表示する", - "uninstallAction": "アンインストール", - "updateAction": "更新", - "updateAll": "すべての拡張機能を更新します" + "openExtensionsFolder": "拡張機能フォルダーを開く" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/fileActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/fileActions.i18n.json index 92a8416066d..84b10a47f95 100644 --- a/i18n/jpn/src/vs/workbench/parts/files/browser/fileActions.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/files/browser/fileActions.i18n.json @@ -22,9 +22,9 @@ "deleteButtonLabelTrash": "ゴミ箱に移動(&&M)", "dirtyMessageFile": "保存されていない変更があるファイルの名前を変更します。続行しますか?", "dirtyMessageFileDelete": "保存されていない変更があるファイルを削除します。続行しますか?", - "dirtyMessageFolder": "保存されていない変更がある {0} 個のファイルを含むフォルダーの名前を変更します。続行しますか?", - "dirtyMessageFolderDelete": "保存されていない変更がある {0} 個のファイルを含むフォルダーを削除します。続行しますか?", - "dirtyMessageFolderOne": "保存されていない変更がある 1 個のファイルを含むフォルダーの名前を変更します。続行しますか?", + "dirtyMessageFolder": "保存されていない変更があるファイルを {0} 個含むフォルダーの名前を変更します。続行しますか?", + "dirtyMessageFolderDelete": "保存されていない変更があるファイルを {0} 個含むフォルダーを削除します。続行しますか?", + "dirtyMessageFolderOne": "保存されていない変更があるファイルを 1 個含むフォルダーの名前を変更します。続行しますか?", "dirtyMessageFolderOneDelete": "保存されていない変更がある 1 個のファイルを含むフォルダーを削除します。続行しますか?", "dirtyWarning": "保存しないと変更内容が失われます。", "duplicateFile": "重複", diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json index 20f745a8111..e8b0af8616e 100644 --- a/i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json @@ -20,6 +20,7 @@ "files.exclude.when": "一致するファイルの兄弟をさらにチェックします。一致するファイル名の変数として $(basename) を使用します。", "filesConfigurationTitle": "ファイル", "formatOnSave": "ファイルを保存するときにフォーマットしてください。フォーマッタを使用可能にして、ファイルを自動保存せず、エディターをシャットダウンしないでください。", + "insertFinalNewline": "有効にすると、ファイルの保存時に最新の行を末尾に挿入します。", "openEditorsVisible": "[開いているエディター] ウィンドウに表示されているエディターの数。0 に設定するとウィンドウが非表示になります。", "showExplorerViewlet": "エクスプローラーを表示", "textFileEditor": "テキスト ファイル エディター", diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json index 2bd3aaaa6c7..d87b32298d0 100644 --- a/i18n/jpn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json @@ -14,7 +14,7 @@ "resolveSaveConflict": "保存時の競合を解決", "retry": "再試行", "revertLocalChanges": "ローカルでの変更を破棄してディスクの内容に戻します", - "saveConflictDiffLabel": "{0} (ディスク上) ↔ {1} ({2})", + "saveConflictDiffLabel": "{0} (ディスク上) ↔ {1} ({2} 内)", "staleSaveError": "'{0} の保存に失敗しました。ディスクの内容の方が新しくなっています。[比較] をクリックしてご使用のバージョンをディスク上のバージョンと比較してください。", "userGuide": "エディター ツール バーの操作で、変更を [元に戻す] か、ディスクの内容を変更内容で [上書き] します" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json index df5e723adfc..39288bdd531 100644 --- a/i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "errors.warnings.show.label": "エラーと警告", + "errors.warnings.show.label": "エラーと警告の表示", "markers.panel.action.filter": "問題のフィルター処理", "markers.panel.aria.label.problems.tree": "ファイル別にグループ化した問題", "markers.panel.at.ln.col.number": "({0}, {1})", @@ -25,15 +25,15 @@ "markers.panel.title.problems": "問題", "problems.panel.configuration.autoreveal": "ファイルを開くときに問題ビューに自動的にそのファイルを表示するかどうかを制御します", "problems.panel.configuration.title": "問題ビュー", - "problems.tree.aria.label.error.marker": "{0}: {1} によって生成されたエラー (行 {2}、列 {3})", - "problems.tree.aria.label.error.marker.nosource": "エラー: {0} (行 {1}、列 {2})", - "problems.tree.aria.label.info.marker": "{0}: {1} によって生成された情報 (行 {2}、列 {3})", - "problems.tree.aria.label.info.marker.nosource": "情報: {0} (行 {1}、列 {2})", - "problems.tree.aria.label.marker": "{0}: {1} によって生成された問題 (行 {2}、列 {3})", - "problems.tree.aria.label.marker.nosource": "問題: {0} (行 {1}、列 {2})", + "problems.tree.aria.label.error.marker": "{0}: {1} によって生成されたエラー (行 {2}、文字 {3})", + "problems.tree.aria.label.error.marker.nosource": "エラー: {0} (行 {1}、文字 {2})", + "problems.tree.aria.label.info.marker": "{0}: {1} によって生成された情報 (行 {2}、文字 {3})", + "problems.tree.aria.label.info.marker.nosource": "情報: {0} (行 {1}、文字 {2})", + "problems.tree.aria.label.marker": "{0}: {1} によって生成された問題 (行 {2}、文字 {3})", + "problems.tree.aria.label.marker.nosource": "問題: {0} (行 {1}、文字 {2})", "problems.tree.aria.label.resource": "{0} (問題あり {1})", - "problems.tree.aria.label.warning.marker": "{0}: {1} によって生成された警告 (行 {2}、列 {3})", - "problems.tree.aria.label.warning.marker.nosource": "警告: {0} (行 {1}、列 {2})", + "problems.tree.aria.label.warning.marker": "{0}: {1} によって生成された警告 (行 {2}、文字 {3})", + "problems.tree.aria.label.warning.marker.nosource": "警告: {0} (行 {1}、文字 {2})", "problems.view.show.label": "問題を表示する", "viewCategory": "表示" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json new file mode 100644 index 00000000000..86ee4186a5b --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "neverAgain": "今後は表示しない", + "remindLater": "後で通知する", + "surveyQuestion": "短いフィードバック アンケートにご協力をお願いできますか?", + "takeSurvey": "アンケートの実施" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json index 97619d13033..ee37b772202 100644 --- a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json @@ -25,8 +25,8 @@ "JsonSchema.options.cwd": "実行されるプログラムまたはスクリプトの現在の作業ディレクトリ。省略すると、Code の現在のワークスペースのルートが使用されます。", "JsonSchema.options.env": "実行されるプログラムまたはシェルの環境。省略すると、親プロセスの環境が使用されます。", "JsonSchema.pattern.code": "問題のコードの一致グループ インデックス。既定は undefined です", - "JsonSchema.pattern.column": "問題の列の一致グループ インデックス。既定は 3 です", - "JsonSchema.pattern.endColumn": "問題の最終列の一致グループ インデックス。既定は undefined です", + "JsonSchema.pattern.column": "問題の行の文字一致グループ インデックス。既定は 3 です", + "JsonSchema.pattern.endColumn": "問題の最終行の文字の一致グループ インデックス。既定は undefined です", "JsonSchema.pattern.endLine": "問題の最終行の一致グループ インデックス。既定は undefined です", "JsonSchema.pattern.file": "ファイル名の一致グループ インデックス。省略すると、1 が使用されます。", "JsonSchema.pattern.line": "問題の行の一致グループ インデックス。既定は 2 です", @@ -69,7 +69,7 @@ "RunTaskAction.label": "タスクの実行", "ShowLogAction.label": "タスク ログの表示", "TaskSystem.active": "現在アクティブな実行中のタスクがあります。まずこのタスクを終了してから、別のタスクを実行してください。", - "TaskSystem.activeSame": "タスクは既にアクティブおよびウォッチ モードになっています。", + "TaskSystem.activeSame": "タスクは既にアクティブおよびウォッチ モードになっています。タスクを終了するには、`F1 > terminate task` を使用します", "TaskSystem.exitAnyways": "常に終了(&&E)", "TaskSystem.invalidTaskJson": "エラー: tasks.json ファイルの内容に構文エラーがあります。訂正してからタスクを実行してください。\n", "TaskSystem.noBuildType": "構成されている有効なタスク ランナーがありません。サポートされているタスク ランナーは 'service' と 'program' です。", diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json index f69420b3b93..9df7496a25d 100644 --- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json @@ -21,6 +21,6 @@ "workbench.action.terminal.scrollToTop": "一番上にスクロール", "workbench.action.terminal.scrollUp": "上にスクロール (行)", "workbench.action.terminal.scrollUpPage": "スクロール アップ (ページ)", - "workbench.action.terminal.switchTerminalInstance": "スイッチ端末インスタンス", + "workbench.action.terminal.switchTerminalInstance": "端末インスタンスをスイッチ", "workbench.action.terminal.toggleTerminal": "統合端末の切り替え" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json index 78dc7d1a2d1..9d896934dc6 100644 --- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "terminal.integrated.copySelection.noSelection": "ターミナルにフォーカスがない場合は、ターミナルの選択をコピーできません", - "terminal.integrated.exitedWithCode": "端末処理が終了しました (終了コード: {0})" + "terminal.integrated.exitedWithCode": "端末処理が終了しました (終了コード: {0})", + "terminal.integrated.launchFailed": "端末プロセス コマンド `{0}{1}` を起動できませんでした (終了コード: {2})" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json index 320cec62f7c..7b48643fcf5 100644 --- a/i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json +++ b/i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json @@ -9,6 +9,6 @@ "errorInvalidConfiguration": "設定を書き込めません。**User Settings** を開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。", "errorInvalidConfigurationWorkspace": "設定を書き込めません。**Workspace Settings** を開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。", "errorInvalidTarget": "構成ファイルに書き込めません (無効なターゲット)", - "errorNoWorkspaceOpened": "開いているフォルダーがないため、設定を書き込めきません。最初にフォルダーを開いてから、もう一度お試しください。", + "errorNoWorkspaceOpened": "開いているフォルダーがないため、設定を書き込めません。最初にフォルダーを開いてから、もう一度お試しください。", "errorUnknownKey": "構成ファイルに書き込めません (不明なキー)" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/jpn/src/vs/workbench/services/message/browser/messageList.i18n.json new file mode 100644 index 00000000000..7f3c35688a9 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/services/message/browser/messageList.i18n.json @@ -0,0 +1,14 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "alertErrorMessage": "エラー: {0}", + "alertInfoMessage": "情報: {0}", + "alertWarningMessage": "警告: {0}", + "close": "閉じる", + "error": "エラー", + "info": "情報", + "warning": "警告" +} \ No newline at end of file diff --git a/i18n/kor/extensions/typescript/package.i18n.json b/i18n/kor/extensions/typescript/package.i18n.json index ea05f623683..514370188c0 100644 --- a/i18n/kor/extensions/typescript/package.i18n.json +++ b/i18n/kor/extensions/typescript/package.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "configuration.typescript": "TypeScript.", + "configuration.typescript": "TypeScript", "format.insertSpaceAfterCommaDelimiter": "쉼표 구분 기호 뒤에 오는 공백 처리를 정의합니다.", "format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "익명 함수의 function 키워드 뒤에 오는 공백 처리를 정의합니다.", "format.insertSpaceAfterKeywordsInControlFlowStatements": "제어 흐름 문의 키워드 뒤에 오는 공백 처리를 정의합니다.", diff --git a/i18n/kor/src/vs/code/electron-main/menus.i18n.json b/i18n/kor/src/vs/code/electron-main/menus.i18n.json index 4b964156d1b..a64d345cf82 100644 --- a/i18n/kor/src/vs/code/electron-main/menus.i18n.json +++ b/i18n/kor/src/vs/code/electron-main/menus.i18n.json @@ -46,6 +46,7 @@ "miGotoLine": "줄로 이동(&&L)...", "miGotoSymbolInFile": "파일의 기호로 이동(&&S)...", "miGotoSymbolInWorkspace": "작업 영역의 기호로 이동(&&W)...", + "miHideActivityBar": "작업 막대 숨기기(&&A)", "miHideStatusbar": "상태 표시줄 숨기기(&&H)", "miInstallingUpdate": "업데이트를 설치하는 중...", "miIntroductoryVideos": "소개 비디오(&&V)", @@ -88,6 +89,7 @@ "miSelectAll": "모두 선택(&&S)", "miSelectColorTheme": "색 테마(&&C)", "miSelectIconTheme": "파일 아이콘 테마(&&I)", + "miShowActivityBar": "작업 막대 표시(&&A)", "miShowStatusbar": "상태 표시줄 표시(&&S)", "miSplitEditor": "편집기 분할(&&E)", "miSwitchEditor": "편집기 전환(&&E)", diff --git a/i18n/kor/src/vs/code/electron-main/windows.i18n.json b/i18n/kor/src/vs/code/electron-main/windows.i18n.json index 8801600c0ca..9c094c1c443 100644 --- a/i18n/kor/src/vs/code/electron-main/windows.i18n.json +++ b/i18n/kor/src/vs/code/electron-main/windows.i18n.json @@ -10,10 +10,14 @@ "appStalled": "창이 더 이상 응답하지 않습니다.", "appStalledDetail": "창을 다시 열거나, 닫거나, 계속 기다릴 수 있습니다.", "close": "닫기", + "folderDesc": "{0} {1}", "hiddenMenuBar": "**Alt** 키를 눌러 메뉴 모음에 계속 액세스할 수 있습니다.", + "newWindow": "새 창", + "newWindowDesc": "새 창을 엽니다.", "ok": "확인", "pathNotExistDetail": "'{0}' 경로가 디스크에 더 이상 없는 것 같습니다.", "pathNotExistTitle": "경로가 없습니다.", + "recentFolders": "최근 폴더", "reopen": "다시 열기", "wait": "계속 대기" } \ No newline at end of file diff --git a/i18n/kor/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/kor/src/vs/editor/common/services/modelServiceImpl.i18n.json index 1885390a4e5..30a9711011a 100644 --- a/i18n/kor/src/vs/editor/common/services/modelServiceImpl.i18n.json +++ b/i18n/kor/src/vs/editor/common/services/modelServiceImpl.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "diagAndSource": "[{0}] {1}", + "diagAndSourceMultiline": "[{0}]\n{1}", "indentAutoMigrate": "설정 업데이트 필요: `editor.detectIndentation`은 `editor.tabSize`를 바꿈: \"auto\" 또는 `editor.insertSpaces`: \"auto\"" } \ No newline at end of file diff --git a/i18n/kor/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/kor/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json new file mode 100644 index 00000000000..d673dec4585 --- /dev/null +++ b/i18n/kor/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json @@ -0,0 +1,19 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "parseErrors": "{0}을(를) 구문 분석하는 동안 오류가 발생했습니다. {1}", + "schema.autoClosingPairs": "대괄호 쌍을 정의합니다. 여는 대괄호를 입력하면 닫는 대괄호가 자동으로 삽입됩니다.", + "schema.autoClosingPairs.notIn": "자동 쌍을 사용하지 않도록 설정된 범위 목록을 정의합니다.", + "schema.blockComment.begin": "블록 주석을 시작하는 문자 시퀀스입니다.", + "schema.blockComment.end": "블록 주석을 끝내는 문자 시퀀스입니다.", + "schema.blockComments": "블록 주석이 표시되는 방법을 정의합니다.", + "schema.brackets": "들여쓰기를 늘리거나 줄이는 대괄호 기호를 정의합니다.", + "schema.closeBracket": "닫는 대괄호 문자 또는 문자열 시퀀스입니다.", + "schema.comments": "주석 기호 정의", + "schema.lineComment": "줄 주석을 시작하는 문자 시퀀스입니다.", + "schema.openBracket": "여는 대괄호 문자 또는 문자열 시퀀스입니다.", + "schema.surroundingPairs": "선택한 문자열을 둘러싸는 데 사용할 수 있는 대괄호 쌍을 정의합니다." +} \ No newline at end of file diff --git a/i18n/kor/src/vs/editor/node/textMate/TMSyntax.i18n.json b/i18n/kor/src/vs/editor/node/textMate/TMSyntax.i18n.json index 408d6a1a1f1..3950e46910a 100644 --- a/i18n/kor/src/vs/editor/node/textMate/TMSyntax.i18n.json +++ b/i18n/kor/src/vs/editor/node/textMate/TMSyntax.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages`의 잘못된 값입니다. 범위 이름에서 언어까지의 개체 맵이어야 합니다. 제공된 값: {1}", + "invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages` 값이 잘못되었습니다. 범위 이름에서 언어까지의 개체 맵이어야 합니다. 제공된 값: {1}", "invalid.injectTo": "`contributes.{0}.injectTo`의 값이 잘못되었습니다. 언어 범위 이름 배열이어야 합니다. 제공된 값: {1}", "invalid.language": "`contributes.{0}.language`에 알 수 없는 언어가 있습니다. 제공된 값: {1}", "invalid.path.0": "`contributes.{0}.path`에 문자열이 필요합니다. 제공된 값: {1}", diff --git a/i18n/kor/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/kor/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json new file mode 100644 index 00000000000..65534688ca8 --- /dev/null +++ b/i18n/kor/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noWorkspace": "작업 영역이 없습니다." +} \ No newline at end of file diff --git a/i18n/kor/src/vs/platform/request/node/request.i18n.json b/i18n/kor/src/vs/platform/request/node/request.i18n.json new file mode 100644 index 00000000000..6cb19699a4e --- /dev/null +++ b/i18n/kor/src/vs/platform/request/node/request.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "httpConfigurationTitle": "HTTP", + "proxy": "사용할 프록시 설정입니다. 설정되지 않으면 http_proxy 및 https_proxy 환경 변수에서 가져옵니다.", + "proxyAuthorization": "모든 네트워크 요청에 대해 'Proxy-Authorization' 헤더로 보낼 값입니다.", + "strictSSL": "제공된 CA 목록에 대해 프록시 서버 인증서를 확인해야 하는지 여부를 나타냅니다." +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/kor/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json new file mode 100644 index 00000000000..502b30ce1a7 --- /dev/null +++ b/i18n/kor/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider '{0}'에서 루트 노드를 제공하지 못했습니다.", + "treeExplorer.failedToResolveChildren": "TreeExplorerNodeProvider '{0}'에서 자식을 확인하지 못했습니다.", + "treeExplorer.notRegistered": "ID가 '{0}'인 등록된 TreeExplorerNodeProvider가 없습니다." +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/kor/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json new file mode 100644 index 00000000000..45a61352e62 --- /dev/null +++ b/i18n/kor/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionUnderDevelopment": "{0}에서 개발 확장 로드 중", + "overwritingExtension": "확장 {0}을(를) {1}(으)로 덮어쓰는 중입니다." +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json new file mode 100644 index 00000000000..5f1c2c64800 --- /dev/null +++ b/i18n/kor/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "toggleActivityBar": "작업 막대 표시 유형 전환", + "view": "보기" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/panel/panelPart.i18n.json index 2fbd5cf970e..bce4b1f8ff9 100644 --- a/i18n/kor/src/vs/workbench/browser/parts/panel/panelPart.i18n.json +++ b/i18n/kor/src/vs/workbench/browser/parts/panel/panelPart.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closePanel": "닫기", + "closePanel": "패널 닫기", "focusPanel": "패널로 포커스 이동", "toggleMaximizedPanel": "최대화된 패널 설정/해제", "togglePanel": "패널 설정/해제", diff --git a/i18n/kor/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json index 229115ff9f4..b4c9b19c471 100644 --- a/i18n/kor/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json +++ b/i18n/kor/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json @@ -13,5 +13,5 @@ "noResultsFound1": "결과 없음", "pickHistory": "기록에서 제거할 편집기 항목 선택", "quickOpenInput": "'?'를 입력하면 여기에서 수행할 수 있는 작업에 대한 도움말을 확인할 수 있습니다.", - "removeFromEditorHistory": "편집기 기록에서 제거" + "removeFromEditorHistory": "기록에서 제거" } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json index 86a54f0281f..69649c709fe 100644 --- a/i18n/kor/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json +++ b/i18n/kor/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json @@ -4,5 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "canNotRun": "'{0}' 명령은 여기에서 실행할 수 없습니다." + "canNotRun": "'{0}' 명령은 현재 사용하도록 설정되지 않아 실행할 수 없습니다." } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/extensionHost.i18n.json new file mode 100644 index 00000000000..9d19121fc55 --- /dev/null +++ b/i18n/kor/src/vs/workbench/electron-browser/extensionHost.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionHostProcess.crash": "확장 호스트가 예기치 않게 종료되었습니다. 복구하려면 창을 다시 로드하세요.", + "extensionHostProcess.error": "확장 호스트에서 오류 발생: {0}", + "extensionHostProcess.startupFail": "확장 호스트가 10초 이내에 시작되지 않았습니다. 문제가 발생했을 수 있습니다.", + "extensionHostProcess.startupFailDebug": "확장 호스트가 10초 내에 시작되지 않았습니다. 첫 번째 줄에서 중지되었을 수 있습니다. 계속하려면 디버거가 필요합니다." +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/electron-browser/integration.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/integration.i18n.json index e04a1f39d8f..6932d6627c5 100644 --- a/i18n/kor/src/vs/workbench/electron-browser/integration.i18n.json +++ b/i18n/kor/src/vs/workbench/electron-browser/integration.i18n.json @@ -6,10 +6,8 @@ { "copy": "복사", "cut": "잘라내기", - "files": "파일", - "folders": "폴더", - "openRecentPlaceHolder": "열기 경로 선택(새 창에서 열려면 Ctrl 키를 길게 누름)", - "openRecentPlaceHolderMac": "경로 선택(새 창에서 열려면 Cmd 키를 길게 누름)", + "developer": "개발자", + "file": "파일", "paste": "붙여넣기", "redo": "다시 실행", "selectAll": "모두 선택", diff --git a/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json index 7d8003ba320..e625d7e732a 100644 --- a/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json +++ b/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "activityBarVisibility": "워크벤치에서 작업 막대의 표시 유형을 제어합니다.", "closeOnFocusLost": "Quick Open가 포커스를 잃으면 자동으로 닫을지 여부를 제어합니다.", - "developer": "개발자", "editorOpenPositioning": "편집기가 열리는 위치를 제어합니다. 현재 활성 편집기의 왼쪽 또는 오른쪽에서 편집기를 열려면 '왼쪽' 또는 '오른쪽'을 선택합니다. 현재 활성 편집기와 독립적으로 편집기를 열려면 '처음' 또는 '마지막'을 선택합니다.", "enablePreview": "열려 있는 편집기를 미리 보기로 표시할지 여부를 제어합니다. 미리 보기 편집기는 유지된 상태까지(예: 두 번 클릭 또는 편집을 통해) 다시 사용됩니다.", "enablePreviewFromQuickOpen": "Quick Open에서 연 편집기를 미리 보기로 표시할지 여부를 제어합니다. 미리 보기 편집기는 유지된 상태까지(예: 두 번 클릭 또는 편집을 통해) 다시 사용됩니다.", @@ -15,12 +15,13 @@ "openFilesInNewWindow": "사용하도록 설정한 경우 기존 인스턴스를 재사용하지 않고 파일이 새 창에서 열립니다.", "reopenFolders": "다시 시작한 이후에 폴더를 다시 여는 방법을 제어합니다. 폴더를 다시 열지 않으려면 'none'을 선택하고, 마지막으로 작업한 폴더를 다시 열려면 'one'을 선택하고, 마지막 세션의 모든 폴더를 다시 열려면 'all'을 선택합니다.", "restoreFullscreen": "창이 전체 화면 모드에서 종료된 경우 창을 전체 화면 모드로 복원할지 여부를 제어합니다.", + "showEditorTabCloseButton": "편집기 탭에 표시 가능한 닫기 단추가 있어야 하는지 여부를 제어합니다.", "showEditorTabs": "열려 있는 편집기를 탭에서 표시할지 여부를 제어합니다.", + "showFullPath": "사용하도록 설정한 경우 창 제목에 열린 파일의 전체 경로가 표시됩니다.", "showIcons": "열린 편집기를 아이콘과 함께 표시할지 여부를 제어합니다. 이를 위해서는 아이콘 테마도 사용하도록 설정해야 합니다.", "sideBarLocation": "사이드바의 위치를 제어합니다. 워크벤치의 왼쪽이나 오른쪽에 표시될 수 있습니다.", "statusBarVisibility": "워크벤치 아래쪽에서 상태 표시줄의 표시 유형을 제어합니다.", - "updateChannel": "업데이트 채널에서 자동 업데이트를 받을지 여부를 구성합니다. 변경 후 다시 시작해야 합니다.", - "updateConfigurationTitle": "업데이트", + "titleBarStyle": "창 제목 표시줄의 모양을 조정합니다. 변경 내용을 적용하려면 전체 다시 시작해야 합니다.", "view": "보기", "windowConfigurationTitle": "창", "workbenchConfigurationTitle": "워크벤치", diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json index 176b7826073..b4e853b2669 100644 --- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json @@ -10,18 +10,16 @@ "addToWatchExpressions": "조사식에 추가", "addWatchExpression": "식 추가", "clearRepl": "콘솔 지우기", - "conditionalBreakpointEditorAction": "디버그: 조건부 중단점 추가...", "continueDebug": "계속", "deactivateBreakpoints": "중단점 비활성화", - "debugAddToWatch": "디버그: 조사식에 추가", "debugConsoleAction": "디버그 콘솔", - "debugEvaluate": "디버그: 평가", "debugFocusConsole": "포커스 디버그 콘솔", "disableAllBreakpoints": "모든 중단점 해제", "disconnectDebug": "연결 끊기", "editConditionalBreakpoint": "중단점 편집...", "editWatchExpression": "식 편집", "enableAllBreakpoints": "모든 중단점 설정", + "focusProcess": "포커스 프로세스", "launchJsonNeedsConfigurtion": "'launch.json' 구성 또는 수정", "openLaunchJson": "{0} 열기", "pauseDebug": "일시 중지", @@ -34,10 +32,9 @@ "renameFunctionBreakpoint": "함수 중단점 이름 바꾸기", "restartDebug": "다시 시작", "restartFrame": "프레임 다시 시작", - "runToCursor": "디버그: 커서까지 실행", + "reverseContinue": "반전", "selectConfig": "구성 선택", "setValue": "값 설정", - "showDebugHover": "디버그: 가리키기 표시", "startDebug": "디버깅 시작", "startWithoutDebugging": "디버깅하지 않고 시작", "stepBackDebug": "뒤로 이동", @@ -45,7 +42,6 @@ "stepOutDebug": "단계 출력", "stepOverDebug": "단위 실행", "stopDebug": "중지", - "toggleBreakpointAction": "디버그: 중단점 설정/해제", "toggleEnablement": "중단점 사용/사용 안 함", "unreadOutput": "디버그 콘솔의 새 출력" } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json new file mode 100644 index 00000000000..8737ff97d69 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json @@ -0,0 +1,13 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "conditionalBreakpointEditorAction": "디버그: 조건부 중단점 추가...", + "debugAddToWatch": "디버그: 조사식에 추가", + "debugEvaluate": "디버그: 평가", + "runToCursor": "디버그: 커서까지 실행", + "showDebugHover": "디버그: 가리키기 표시", + "toggleBreakpointAction": "디버그: 중단점 설정/해제" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/common/debug.i18n.json new file mode 100644 index 00000000000..8afc7ba80d3 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/debug/common/debug.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noConfigurations": "구성 없음" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json index 2dd9167f100..e03e06fbe3c 100644 --- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json @@ -12,6 +12,7 @@ "functionBreakpointsNotSupported": "이 디버그 형식은 함수 중단점을 지원하지 않습니다.", "loadMoreStackFrames": "더 많은 스택 프레임 로드", "paused": "일시 중지됨", + "pausedOn": "{0}에서 일시 중지됨", "process": "프로세스", "running": "실행 중", "stackFrameAriaLabel": "스택 프레임 {0} 줄 {1} {2}, 호출 스택, 디버그", diff --git a/i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json index 79994bc0f0f..2153c7fe72c 100644 --- a/i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debugConfigurationNames": "이 \"복합\" 구성의 일부로 실행될 구성입니다. 이 구성의 형식이 \"composite\"인 경우에만 적용됩니다.", "debugLinuxConfiguration": "Linux 특정 시작 구성 특성입니다.", "debugName": "구성 이름이며, 구성 시작 드롭다운 메뉴에 표시됩니다.", "debugOSXConfiguration": "OS X 특정 시작 구성 특성입니다.", "debugPrelaunchTask": "디버그 세션이 시작되기 이전에 실행할 작업입니다.", "debugRequest": "구성 형식을 요청합니다. \"시작\" 또는 \"연결\"일 수 있습니다.", + "debugServer": "디버그 확장 배포 전용입니다. 포트가 지정된 경우 VS 코드에서는 서버 모드로 실행하는 디버그 어댑터에 연결을 시도합니다.", "debugType": "구성의 형식입니다.", "debugWindowsConfiguration": "Windows 특정 시작 구성 특성입니다.", "internalConsoleOptions": "내부 디버그 콘솔의 동작을 제어합니다.", diff --git a/i18n/kor/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json index 923b2c8d9b9..f9803d85d56 100644 --- a/i18n/kor/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json @@ -6,6 +6,7 @@ { "DebugConfig.failed": "'.vscode' 폴더({0}) 내에 'launch.json' 파일을 만들 수 없습니다.", "app.launch.json.configurations": "구성 목록입니다. IntelliSense를 사용하여 새 구성을 추가하거나 기존 구성을 편집합니다.", + "app.launch.json.debugServer": "사용되지 않음: debugServer를 구성 내부로 이동하세요.", "app.launch.json.title": "시작", "app.launch.json.version": "이 파일 형식의 버전입니다.", "debugNoType": "디버그 어댑터 '형식'은 생략할 수 없으며 '문자열' 형식이어야 합니다.", diff --git a/i18n/kor/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json b/i18n/kor/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json new file mode 100644 index 00000000000..287d93cf202 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.noMatchingProviderId": "ID가 {providerId}인 등록된 TreeExplorerNodeProvider가 없습니다." +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json new file mode 100644 index 00000000000..ee892b79f3c --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.invalidId": "트리 탐색기 확장 {0}에 잘못된 ID가 있어 활성화하지 못했습니다.", + "vscode.extension.contributes.explorer": "사이드바에 사용자 지정 트리 탐색기 뷰렛을 적용합니다.", + "vscode.extension.contributes.explorer.icon": "작업 막대에서 뷰렛 아이콘에 대한 경로", + "vscode.extension.contributes.explorer.treeExplorerNodeProviderId": "vscode.workspace.registerTreeExplorerNodeProvider를 통해 등록된 공급자를 식별하는 데 사용된 고유 ID", + "vscode.extension.contributes.explorer.treeLabel": "사용자 지정 트리 탐색기를 렌더링하는 데 사용되는 사람이 읽을 수 있는 문자열" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json new file mode 100644 index 00000000000..2dd59787d07 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "disable": "사용 안 함", + "enable": "사용", + "treeExplorer.toggle": "사용자 지정 탐색기 토글", + "view": "보기" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json new file mode 100644 index 00000000000..5553273dba2 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "refresh": "새로 고침" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/kor/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json new file mode 100644 index 00000000000..830ac239054 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorerViewlet.tree": "트리 탐색기 섹션" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json new file mode 100644 index 00000000000..a41970114b7 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "Unknown Dependency": "알 수 없는 종속성:", + "error": "오류" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json new file mode 100644 index 00000000000..98e7611e1b7 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json @@ -0,0 +1,39 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "JSON Validation": "JSON 유효성 검사({0})", + "changelog": "변경 로그", + "command name": "이름", + "commands": "명령({0})", + "contributions": "기여", + "debugger name": "이름", + "debuggers": "디버거({0})", + "default": "기본값", + "dependencies": "종속성", + "description": "설명", + "details": "세부 정보", + "extension id": "확장 ID", + "file extensions": "파일 확장명", + "grammar": "문법", + "install count": "설치 수", + "keyboard shortcuts": "바로 가기 키(&&K)", + "language id": "ID", + "language name": "이름", + "languages": "언어({0})", + "license": "라이선스", + "menuContexts": "메뉴 컨텍스트", + "name": "확장 이름", + "noChangelog": "변경 로그를 사용할 수 없습니다.", + "noContributions": "참여 없음", + "noDependencies": "종속성 없음", + "noReadme": "사용 가능한 추가 정보가 없습니다.", + "publisher": "게시자 이름", + "rating": "등급", + "setting name": "이름", + "settings": "설정({0})", + "snippets": "코드 조각", + "themes": "테마({0})" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json new file mode 100644 index 00000000000..b8f1cf36540 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "close": "닫기", + "neverShowAgain": "다시 표시 안 함", + "reallyRecommended": "'{0}' 확장을 설치하는 것이 좋습니다.", + "showRecommendations": "권장 사항 표시", + "workspaceRecommended": "이 작업 영역에 확장 권장 사항이 있습니다." +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json new file mode 100644 index 00000000000..ea18d84bd5d --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json @@ -0,0 +1,38 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "ConfigureWorkspaceRecommendations.noWorkspace": "권장 사항은 작업 영역 폴더에서만 사용할 수 있습니다.", + "OpenExtensionsFile.failed": "'.vscode' 폴더 내에 'extensions.json' 파일을 만들 수 없습니다({0}).", + "Uninstalling": "제거하는 중", + "builtin": "기본 제공", + "clearExtensionsInput": "확장 입력 지우기", + "configureWorkspaceRecommendedExtensions": "권장 확장 구성(작업 영역)", + "disableAction": "사용 안 함", + "disableAlwaysAction.label": "사용 안 함", + "disableForWorkspaceAction": "작업 영역", + "disableForWorkspaceAction.label": "사용 안 함(작업 영역)", + "disableGloballyAction": "항상", + "enableAction": "사용", + "enableAlwaysAction.label": "사용", + "enableForWorkspaceAction": "작업 영역", + "enableForWorkspaceAction.label": "사용(작업 영역)", + "enableGloballyAction": "항상", + "installAction": "설치", + "installExtensions": "확장 설치", + "installing": "설치 중", + "postUninstallTooltip": "비활성화하려면 다시 로드", + "reloadAction": "다시 로드", + "showDisabledExtensions": "사용할 수 없는 확장 표시", + "showInstalledExtensions": "설치된 확장 표시", + "showOutdatedExtensions": "만료된 확장 표시", + "showPopularExtensions": "자주 사용되는 확장 표시", + "showRecommendedExtensions": "권장되는 확장 표시", + "showWorkspaceRecommendedExtensions": "작업 영역 권장 확장 표시", + "toggleExtensionsViewlet": "확장 표시", + "uninstallAction": "제거", + "updateAction": "업데이트", + "updateAll": "모든 확장 업데이트" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json new file mode 100644 index 00000000000..e5908c7fdd8 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "manage": "확장을 관리하려면 키를 누르세요.", + "noExtensionsToInstall": "확장 이름을 입력하세요.", + "searchFor": "마켓플레이스에서 '{0}'을(를) 검색하려면 키를 누르세요." +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json new file mode 100644 index 00000000000..711ef1cb13d --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "app.extension.identifier.errorMessage": "필요한 형식은 '${publisher}.${name}'입니다. 예: 'vscode.csharp'", + "app.extensions.json.recommendations": "확장 권장 목록입니다. 확장의 식별자는 항상 '${publisher}.${name}'입니다. 예: 'vscode.csharp'", + "app.extensions.json.title": "확장" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json new file mode 100644 index 00000000000..f0735eb55a6 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionsInputName": "확장: {0}" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json index 30ceadac5db..555985718b5 100644 --- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json @@ -4,49 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "ConfigureWorkspaceRecommendations.noWorkspace": "권장 사항은 작업 영역 폴더에서만 사용할 수 있습니다.", - "OpenExtensionsFile.failed": "'.vscode' 폴더 내에 'extensions.json' 파일을 만들 수 없습니다({0}).", - "Uninstalling": "제거하는 중", - "builtin": "기본 제공", - "clearExtensionsInput": "확장 입력 지우기", - "configureWorkspaceRecommendedExtensions": "권장 확장 구성(작업 영역)", - "disableAction": "사용 안 함", - "disableAll": "모두 사용 안 함", - "disableAllWorkspace": "모두 사용 안 함(작업 영역)", - "disableAlwaysAction.label": "사용 안 함", - "disableForWorkspaceAction": "작업 영역", - "disableForWorkspaceAction.label": "사용 안 함(작업 영역)", - "disableGloballyAction": "항상", - "enableAction": "사용", - "enableAll": "모두 사용", - "enableAllWorkspace": "모두 사용(작업 영역)", - "enableAlwaysAction.label": "사용", - "enableForWorkspaceAction": "작업 영역", - "enableForWorkspaceAction.label": "사용(작업 영역)", - "enableGloballyAction": "항상", - "installAction": "설치", - "installExtensions": "확장 설치", + "InstallVSIXAction.reloadNow": "지금 다시 로드", + "InstallVSIXAction.success": "확장이 설치되었습니다. 사용하도록 설정하려면 다시 시작하세요.", "installVSIX": "VSIX에서 설치...", - "installing": "설치 중", - "openExtensionsFolder": "Extensions 폴더 열기", - "postDisableMessage": "'{0}' 확장을 사용하지 않도록 이 창을 다시 로드할까요?", - "postDisableTooltip": "사용하지 않으려면 다시 로드", - "postEnableMessage": "'{0}' 확장을 사용하도록 이 창을 다시 로드할까요?", - "postEnableTooltip": "사용하도록 다시 로드", - "postInstallMessage": "'{0}' 확장을 활성화하도록 이 창을 다시 로드할까요?", - "postInstallTooltip": "활성화하려면 다시 로드", - "postUninstallMessage": "'{0}' 확장을 비활성화하도록 이 창을 다시 로드할까요?", - "postUninstallTooltip": "비활성화하려면 다시 로드", - "reloadAction": "다시 로드", - "reloadNow": "지금 다시 로드", - "showDisabledExtensions": "사용할 수 없는 확장 표시", - "showInstalledExtensions": "설치된 확장 표시", - "showOutdatedExtensions": "만료된 확장 표시", - "showPopularExtensions": "자주 사용되는 확장 표시", - "showRecommendedExtensions": "권장되는 확장 표시", - "showWorkspaceRecommendedExtensions": "작업 영역 권장 확장 표시", - "toggleExtensionsViewlet": "확장 표시", - "uninstallAction": "제거", - "updateAction": "업데이트", - "updateAll": "모든 확장 업데이트" + "openExtensionsFolder": "Extensions 폴더 열기" } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json index 8906eb00764..3ea98fcd19e 100644 --- a/i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json @@ -20,6 +20,7 @@ "files.exclude.when": "일치하는 파일의 형제에 대한 추가 검사입니다. $(basename)을 일치하는 파일 이름에 대한 변수로 사용하세요.", "filesConfigurationTitle": "파일", "formatOnSave": "파일 저장 시 서식을 지정합니다. 포맷터를 사용할 수 있어야 하며, 파일이 자동으로 저장되어야 하고, 편집기가 종료되지 않아야 합니다.", + "insertFinalNewline": "사용하도록 설정되면 저장할 때 파일 끝에 마지막 줄바꿈을 삽입합니다.", "openEditorsVisible": "열려 있는 편집기 창에 표시되는 편집기 수입니다. 창을 숨기려면 0으로 설정합니다.", "showExplorerViewlet": "탐색기 표시", "textFileEditor": "텍스트 파일 편집기", diff --git a/i18n/kor/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/kor/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json index a7977209000..c24ae096b74 100644 --- a/i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "errors.warnings.show.label": "오류 및 경고", + "errors.warnings.show.label": "오류 및 경고 표시", "markers.panel.action.filter": "문제 필터링", "markers.panel.aria.label.problems.tree": "파일별로 그룹화된 문제", "markers.panel.at.ln.col.number": "({0}, {1})", @@ -25,15 +25,15 @@ "markers.panel.title.problems": "문제", "problems.panel.configuration.autoreveal": "문제 보기를 열 때 문제 보기에 자동으로 파일이 표시되어야 하는지를 제어합니다.", "problems.panel.configuration.title": "문제 보기", - "problems.tree.aria.label.error.marker": "{0}에 의해 오류가 발생함: 줄 {2} 및 열 {3}의 {1}", - "problems.tree.aria.label.error.marker.nosource": "오류: 줄 {1} 및 열 {2}의 {0}", - "problems.tree.aria.label.info.marker": "{0}에 의해 정보가 생성됨: 줄 {2} 및 열 {3}의 {1}", - "problems.tree.aria.label.info.marker.nosource": "정보: 줄 {1} 및 열 {2}의 {0}", - "problems.tree.aria.label.marker": "{0}에 의해 문제가 발생함: 줄 {2} 및 열 {3}의 {1}", - "problems.tree.aria.label.marker.nosource": "문제: 줄 {1} 및 열 {2}의 {0}", + "problems.tree.aria.label.error.marker": "{0}에 의해 오류 발생: 줄 {2} 및 문자 {3}의 {1}", + "problems.tree.aria.label.error.marker.nosource": "오류: 줄 {1} 및 문자 {2}의 {0}", + "problems.tree.aria.label.info.marker": "{0}에 의해 정보 생성됨: 줄 {2} 및 문자 {3}의 {1}", + "problems.tree.aria.label.info.marker.nosource": "정보: 줄 {1} 및 문자 {2}의 {0}", + "problems.tree.aria.label.marker": "{0}에 의해 문제 발생: 줄 {2} 및 문자 {3}의 {1}", + "problems.tree.aria.label.marker.nosource": "문제: 줄 {1} 및 문자 {2}의 {0}", "problems.tree.aria.label.resource": "{0}에 {1}개의 문제가 있음", - "problems.tree.aria.label.warning.marker": "{0}에 의해 경고가 발생함: 줄 {2} 및 열 {3}의 {1}", - "problems.tree.aria.label.warning.marker.nosource": "경고: 줄 {1} 및 열 {2}의 {0}", + "problems.tree.aria.label.warning.marker": "{0}에 의해 경고 발생: 줄 {2} 및 문자 {3}의 {1}", + "problems.tree.aria.label.warning.marker.nosource": "경고: 줄 {1} 및 문자 {2}의 {0}", "problems.view.show.label": "문제 표시", "viewCategory": "보기" } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json new file mode 100644 index 00000000000..951ed1b50a7 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "neverAgain": "다시 표시 안 함", + "remindLater": "나중에 알림", + "surveyQuestion": "간단한 피드백 설문 조사에 참여하시겠어요?", + "takeSurvey": "설문 조사 참여" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json index de4f6be4a32..fab90b25aea 100644 --- a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json @@ -25,12 +25,12 @@ "JsonSchema.options.cwd": "실행된 프로그램 또는 스크립트의 현재 작업 디렉터리입니다. 생략된 경우 Code의 현재 작업 영역 루트가 사용됩니다.", "JsonSchema.options.env": "실행할 프로그램 또는 셸의 환경입니다. 생략하면 부모 프로세스의 환경이 사용됩니다.", "JsonSchema.pattern.code": "문제 코드의 일치 그룹 인덱스입니다. 기본적으로 정의되지 않습니다.", - "JsonSchema.pattern.column": "문제 열의 일치 그룹 인덱스입니다. 기본값은 3입니다.", - "JsonSchema.pattern.endColumn": "문제 끝 열의 일치 그룹 인덱스입니다. 기본적으로 정의되지 않습니다.", + "JsonSchema.pattern.column": "문제의 줄바꿈 문자의 일치 그룹 인덱스입니다. 기본값은 3입니다.", + "JsonSchema.pattern.endColumn": "문제의 끝 줄바꿈 문자의 일치 그룹 인덱스입니다. 기본값은 정의되지 않았습니다.", "JsonSchema.pattern.endLine": "문제 끝 줄의 일치 그룹 인덱스입니다. 기본적으로 정의되지 않습니다.", "JsonSchema.pattern.file": "파일 이름의 일치 그룹 인덱스입니다. 생략된 경우 1이 사용됩니다.", "JsonSchema.pattern.line": "문제 줄의 일치 그룹 인덱스입니다. 기본값은 2입니다.", - "JsonSchema.pattern.location": "문제 위치의 일치 그룹 인덱스입니다. 유효한 일치 패턴은(line), (line,column) 및 (startLine,startColumn,endLine,endColumn)입니다. 생략하면 line and column이 사용됩니다.", + "JsonSchema.pattern.location": "문제 위치의 일치 그룹 인덱스입니다. 유효한 위치 패턴은 (line), (line,column) 및 (startLine,startColumn,endLine,endColumn)입니다. 생략하면 (line,column)이 사용됩니다.", "JsonSchema.pattern.loop": "여러 줄 선택기 루프에서는 이 패턴이 일치할 경우 루프에서 패턴을 실행할지 여부를 나타냅니다. 여러 줄 패턴의 마지막 패턴에 대해서만 지정할 수 있습니다.", "JsonSchema.pattern.message": "메시지의 일치 그룹 인덱스입니다. 생략된 경우 기본값은 위치가 지정된 경우 4이고, 그렇지 않으면 5입니다.", "JsonSchema.pattern.regexp": "출력에서 오류, 경고 또는 정보를 찾는 정규식입니다.", @@ -69,7 +69,7 @@ "RunTaskAction.label": "작업 실행", "ShowLogAction.label": "작업 로그 표시", "TaskSystem.active": "지금 실행 중인 활성 작업이 있습니다. 다른 작업을 실행하려면 먼저 활성 작업을 종료하세요.", - "TaskSystem.activeSame": "작업이 이미 활성 상태이며 감시 모드입니다.", + "TaskSystem.activeSame": "작업이 이미 활성 상태이며 감시 모드입니다. 작업을 종료하려면 `F1 > 작업 종료`를 사용하세요.", "TaskSystem.exitAnyways": "끝내기(&&E)", "TaskSystem.invalidTaskJson": "오류: tasks.json 파일의 내용에 구문 오류가 있습니다. 작업을 실행하기 전에 오류를 정정하세요.\n", "TaskSystem.noBuildType": "유효한 Task Runner가 구성되어 있지 않습니다. 지원되는 Task Runner는 '서비스' 및 '프로그램'입니다.", diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json index 110b80c4311..68f4532b266 100644 --- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "terminal.integrated.copySelection.noSelection": "터미널에 포커스가 없는 경우 터미널 선택을 복사할 수 없습니다.", - "terminal.integrated.exitedWithCode": "터미널 프로세스가 종료 코드 {0}(으)로 종료되었습니다." + "terminal.integrated.exitedWithCode": "터미널 프로세스가 종료 코드 {0}(으)로 종료되었습니다.", + "terminal.integrated.launchFailed": "터미널 프로세스 명령 `{0}{1}`이(가) 시작하지 못했습니다(종료 코드: {2})." } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/services/history/browser/history.i18n.json b/i18n/kor/src/vs/workbench/services/history/browser/history.i18n.json index cf9d2a732b3..fa26fc1001e 100644 --- a/i18n/kor/src/vs/workbench/services/history/browser/history.i18n.json +++ b/i18n/kor/src/vs/workbench/services/history/browser/history.i18n.json @@ -5,7 +5,7 @@ // Do not edit this file. It is machine generated. { "devExtensionWindowTitle": "[확장 개발 호스트] - {0}", - "patchedWindowTitle": " [지원되지 않음]", + "patchedWindowTitle": "[지원되지 않음]", "prefixDecoration": "● {0}", "prefixTitle": "{0} - {1}", "prefixWorkspaceTitle": "{0} - {1} - {2}", diff --git a/i18n/kor/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/kor/src/vs/workbench/services/message/browser/messageList.i18n.json new file mode 100644 index 00000000000..9ccb4d90f2d --- /dev/null +++ b/i18n/kor/src/vs/workbench/services/message/browser/messageList.i18n.json @@ -0,0 +1,14 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "alertErrorMessage": "오류: {0}", + "alertInfoMessage": "정보: {0}", + "alertWarningMessage": "경고: {0}", + "close": "닫기", + "error": "오류", + "info": "정보", + "warning": "경고" +} \ No newline at end of file diff --git a/i18n/rus/extensions/typescript/package.i18n.json b/i18n/rus/extensions/typescript/package.i18n.json index 0fee41d0ec2..0d2e5d81f27 100644 --- a/i18n/rus/extensions/typescript/package.i18n.json +++ b/i18n/rus/extensions/typescript/package.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "configuration.typescript": "TypeScript.", + "configuration.typescript": "TypeScript", "format.insertSpaceAfterCommaDelimiter": "Определяет метод обработки пробелов после разделителя-запятой.", "format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Определяет метод обработки пробелов после ключевого слова function у анонимных функций.", "format.insertSpaceAfterKeywordsInControlFlowStatements": "Определяет метод обработки пробелов после ключевых слов в операторе управления потоком выполнения.", diff --git a/i18n/rus/src/vs/code/electron-main/menus.i18n.json b/i18n/rus/src/vs/code/electron-main/menus.i18n.json index eb2484e7f0f..46aa11f788f 100644 --- a/i18n/rus/src/vs/code/electron-main/menus.i18n.json +++ b/i18n/rus/src/vs/code/electron-main/menus.i18n.json @@ -46,6 +46,7 @@ "miGotoLine": "Перейти к &&строке...", "miGotoSymbolInFile": "Перейти к &&символу в файле...", "miGotoSymbolInWorkspace": "Перейти к символу в &&рабочей области...", + "miHideActivityBar": "Скрыть &&панель действий", "miHideStatusbar": "&&Скрыть строку состояния", "miInstallingUpdate": "Идет установка обновления...", "miIntroductoryVideos": "Вступительные в&&идео", @@ -88,6 +89,7 @@ "miSelectAll": "&&Выделить все", "miSelectColorTheme": "Цветовая &&тема", "miSelectIconTheme": "Тема значка &&файла", + "miShowActivityBar": "Показать &&панель действий", "miShowStatusbar": "&&Показать строку состояния", "miSplitEditor": "Разделить &&редактор", "miSwitchEditor": "Переключить р&&едактор", diff --git a/i18n/rus/src/vs/code/electron-main/windows.i18n.json b/i18n/rus/src/vs/code/electron-main/windows.i18n.json index e172cbfab73..d60f0632035 100644 --- a/i18n/rus/src/vs/code/electron-main/windows.i18n.json +++ b/i18n/rus/src/vs/code/electron-main/windows.i18n.json @@ -10,10 +10,14 @@ "appStalled": "Окно не отвечает", "appStalledDetail": "Вы можете повторно открыть окно, закрыть его или продолжить ожидание.", "close": "Закрыть", + "folderDesc": "{0} {1}", "hiddenMenuBar": "Вы по-прежнему можете получить доступ к строке меню, нажав клавишу **ALT**.", + "newWindow": "Новое окно", + "newWindowDesc": "Открывает новое окно", "ok": "ОК", "pathNotExistDetail": "Путь \"{0}\" больше не существует на диске.", "pathNotExistTitle": "Путь не существует.", + "recentFolders": "Недавно использованные папки", "reopen": "Открыть повторно", "wait": "Подождать" } \ No newline at end of file diff --git a/i18n/rus/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/rus/src/vs/editor/common/services/modelServiceImpl.i18n.json index 59e76216fec..a02202a4b80 100644 --- a/i18n/rus/src/vs/editor/common/services/modelServiceImpl.i18n.json +++ b/i18n/rus/src/vs/editor/common/services/modelServiceImpl.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "diagAndSource": "[{0}] {1}", + "diagAndSourceMultiline": "[{0}]\n{1}", "indentAutoMigrate": "Измените параметры: editor.detectIndentation заменяет editor.tabSize: auto или editor.insertSpaces: auto" } \ No newline at end of file diff --git a/i18n/rus/src/vs/editor/contrib/rename/browser/rename.i18n.json b/i18n/rus/src/vs/editor/contrib/rename/browser/rename.i18n.json index 74388e0e8b5..aa0abcc6dc7 100644 --- a/i18n/rus/src/vs/editor/contrib/rename/browser/rename.i18n.json +++ b/i18n/rus/src/vs/editor/contrib/rename/browser/rename.i18n.json @@ -4,6 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "rename.failed": "Не удалось выполнить переименование.", + "rename.failed": "Не удалось переименовать.", "rename.label": "Переименовать символ" } \ No newline at end of file diff --git a/i18n/rus/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/rus/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json new file mode 100644 index 00000000000..268f00fea56 --- /dev/null +++ b/i18n/rus/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json @@ -0,0 +1,19 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "parseErrors": "Ошибок при анализе {0}: {1}", + "schema.autoClosingPairs": "Определяет пары скобок. Когда введена открывающая скобка, автоматически добавляется закрывающая.", + "schema.autoClosingPairs.notIn": "Определяет список областей, где автоматические пары отключены.", + "schema.blockComment.begin": "Последовательность символов, открывающая блок комментариев.", + "schema.blockComment.end": "Последовательность символов, закрывающая блок комментариев.", + "schema.blockComments": "Определяет способ маркировки комментариев.", + "schema.brackets": "Определяет символы скобок, увеличивающие или уменьшающие отступ.", + "schema.closeBracket": "Закрывающий символ скобки или строковая последовательность.", + "schema.comments": "Определяет символы комментариев", + "schema.lineComment": "Последовательность символов, с которой начинается строка комментария.", + "schema.openBracket": "Открывающий символ скобки или строковая последовательность.", + "schema.surroundingPairs": "Определяет пары скобок, в которые заключается выбранная строка." +} \ No newline at end of file diff --git a/i18n/rus/src/vs/editor/node/textMate/TMSyntax.i18n.json b/i18n/rus/src/vs/editor/node/textMate/TMSyntax.i18n.json index 26185961f1b..f53d22f0c45 100644 --- a/i18n/rus/src/vs/editor/node/textMate/TMSyntax.i18n.json +++ b/i18n/rus/src/vs/editor/node/textMate/TMSyntax.i18n.json @@ -4,14 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "invalid.embeddedLanguages": "Недопустимое значение в \"contributes.{0}.embeddedLanguages\". Оно должно быть сопоставлением объекта между именем области и языком. Указанное значение: {1}", + "invalid.embeddedLanguages": "Недопустимое значение в \"contributes.{0}.embeddedLanguages\". Оно должно быть сопоставлением объекта между именем области и языком. Указанное значение: {1}.", "invalid.injectTo": "Недопустимое значение в \"contributes.{0}.injectTo\". Должен быть задан массив имен языковых областей. Указанное значение: {1}", "invalid.language": "Неизвестный язык в contributes.{0}.language. Указанное значение: {1}", "invalid.path.0": "В contributes.{0}.path требуется строка. Указанное значение: {1}", "invalid.path.1": "contributes.{0}.path ({1}) должен был быть включен в папку расширения ({2}). Это может сделать расширение непереносимым.", "invalid.scopeName": "В contributes.{0}.scopeName требуется строка. Указанное значение: {1}", "vscode.extension.contributes.grammars": "Добавляет разметчики TextMate.", - "vscode.extension.contributes.grammars.embeddedLanguages": "Сопоставление имени области и идентификатора языка, если грамматика содержит встроенные языки.", + "vscode.extension.contributes.grammars.embeddedLanguages": "Сопоставление имени области и идентификатора языка, если грамматика содержит внедренные языки.", "vscode.extension.contributes.grammars.injectTo": "Список имен языковых областей, в которые вставляется эта грамматика.", "vscode.extension.contributes.grammars.language": "Идентификатор языка, для которого добавляется этот синтаксис.", "vscode.extension.contributes.grammars.path": "Путь к файлу tmLanguage. Путь указывается относительно папки расширения и обычно начинается с \"./syntaxes/\".", diff --git a/i18n/rus/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/rus/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json new file mode 100644 index 00000000000..c1718c64b23 --- /dev/null +++ b/i18n/rus/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noWorkspace": "Нет рабочей области." +} \ No newline at end of file diff --git a/i18n/rus/src/vs/platform/request/node/request.i18n.json b/i18n/rus/src/vs/platform/request/node/request.i18n.json new file mode 100644 index 00000000000..758bd3725b6 --- /dev/null +++ b/i18n/rus/src/vs/platform/request/node/request.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "httpConfigurationTitle": "HTTP", + "proxy": "Используемый параметр прокси. Если он не задан, он будет взят из переменных среды http_proxy и https_proxy.", + "proxyAuthorization": "Значение, отправляемое как заголовок \"Proxy-Authorization\" для каждого сетевого запроса.", + "strictSSL": "Должен ли сертификат прокси-сервера проверяться по списку предоставленных ЦС." +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/rus/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json new file mode 100644 index 00000000000..acf08483d46 --- /dev/null +++ b/i18n/rus/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider \"{0}\" не удалось предоставить корневой узел.", + "treeExplorer.failedToResolveChildren": "TreeExplorerNodeProvider \"{0}\" не удалось выполнить операцию resolveChildren.", + "treeExplorer.notRegistered": "TreeExplorerNodeProvider с идентификатором \"{0}\" не зарегистрирован." +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/rus/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json new file mode 100644 index 00000000000..a2b09bdc3ef --- /dev/null +++ b/i18n/rus/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionUnderDevelopment": "Идет загрузка расширения разработки в {0}.", + "overwritingExtension": "Идет перезапись расширения {0} на {1}." +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json new file mode 100644 index 00000000000..7dee648f618 --- /dev/null +++ b/i18n/rus/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "toggleActivityBar": "Показать или скрыть панель действий", + "view": "Просмотреть" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/panel/panelPart.i18n.json index 9c2156c6eec..4b5e71a91fb 100644 --- a/i18n/rus/src/vs/workbench/browser/parts/panel/panelPart.i18n.json +++ b/i18n/rus/src/vs/workbench/browser/parts/panel/panelPart.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closePanel": "Закрыть", + "closePanel": "Закрыть панель", "focusPanel": "Фокус на панель", "toggleMaximizedPanel": "Развернутая панель", "togglePanel": "Панель", diff --git a/i18n/rus/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json index 125c25e6fd2..d77cbd2478c 100644 --- a/i18n/rus/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json +++ b/i18n/rus/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json @@ -13,5 +13,5 @@ "noResultsFound1": "Результаты не найдены", "pickHistory": "Выбор записи редактора, удаляемой из журнала", "quickOpenInput": "Введите \"?\", чтобы узнать, какие отсюда можно выполнить действия", - "removeFromEditorHistory": "Удалить из журнала редакторов" + "removeFromEditorHistory": "Удалить из журнала" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json index 65694ee3b90..2d4acc9a572 100644 --- a/i18n/rus/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json +++ b/i18n/rus/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json @@ -4,5 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "canNotRun": "Выполнить команду {0} отсюда невозможно." + "canNotRun": "Команда \"{0}\" сейчас неактивна, и ее невозможно выполнить." } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/extensionHost.i18n.json new file mode 100644 index 00000000000..cfafaa50ee5 --- /dev/null +++ b/i18n/rus/src/vs/workbench/electron-browser/extensionHost.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionHostProcess.crash": "Хост-процесс для расширений неожиданно завершил работу. Загрузите окно повторно для восстановления.", + "extensionHostProcess.error": "Ошибка в хост-процессе для расширений: {0}", + "extensionHostProcess.startupFail": "Хост-процесс для расширений не запустился спустя 10 секунд. Возможно, произошла ошибка.", + "extensionHostProcess.startupFailDebug": "Хост-процесс для расширений не был запущен в течение 10 секунд. Возможно, он был остановлен в первой строке, а для продолжения требуется отладчик." +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/electron-browser/integration.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/integration.i18n.json index 13a4385b5fb..3c253fccabc 100644 --- a/i18n/rus/src/vs/workbench/electron-browser/integration.i18n.json +++ b/i18n/rus/src/vs/workbench/electron-browser/integration.i18n.json @@ -6,10 +6,8 @@ { "copy": "Копировать", "cut": "Вырезать", - "files": "файлы", - "folders": "папки", - "openRecentPlaceHolder": "Выбрать папку для открытия (удерживайте клавишу CTRL, чтобы открыть ее в новом окне)", - "openRecentPlaceHolderMac": "Выбрать путь (удерживайте клавишу CMD, чтобы открыть в новом окне)", + "developer": "Разработчик", + "file": "Файл", "paste": "Вставить", "redo": "Вернуть", "selectAll": "Выбрать все", diff --git a/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json index 9dd76bfcb12..b110e7a5c99 100644 --- a/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json +++ b/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "activityBarVisibility": "Управляет видимостью панели действий на рабочем месте.", "closeOnFocusLost": "Управляет автоматическим закрытием Quick Open при потере фокуса.", - "developer": "Разработчик", "editorOpenPositioning": "Определяет место открытия редакторов. Выберите \"Слева\" или \"Справа\", чтобы открывать редакторы слева или справа от активного сейчас редактора. Выберите \"Первый\" или \"Последний\", чтобы открывать редакторы независимо от активного сейчас редактора.", "enablePreview": "Определяет, отображаются ли открытые редакторы в режиме предварительного просмотра. Редакторы с предварительным просмотром повторно используются до сохранения (например, с помощью двойного щелчка или изменения).", "enablePreviewFromQuickOpen": "Определяет, отображаются ли редакторы из Quick Open в режиме предварительного просмотра. Редакторы в режиме предварительного просмотра повторно используются до сохранения (например, с помощью двойного щелчка или изменения).", @@ -15,12 +15,13 @@ "openFilesInNewWindow": "Если этот параметр включен, файлы будут открываться в новом окне, а не в существующем экземпляре.", "reopenFolders": "Управляет повторным открытием папок после перезапуска. Выберите значение \"none\", чтобы не открывать папку повторно, \"one\", чтобы открывалась последняя папка, с которой вы работали, или \"all\", чтобы открывались все папки последнего сеанса.", "restoreFullscreen": "Определяет, должно ли окно восстанавливаться в полноэкранном режиме, если оно было закрыто в полноэкранном режиме.", + "showEditorTabCloseButton": "Управляет видимостью кнопки закрытия на вкладках редактора.", "showEditorTabs": "Определяет, должны ли открытые редакторы отображаться на вкладках или нет.", + "showFullPath": "Если включено, в заголовке окна отображается полный путь к открытым файлам.", "showIcons": "Определяет, должны ли открытые редакторы отображаться со значком. Требует включить тему значков.", "sideBarLocation": "Определяет расположение боковой панели: слева или справа от рабочего места.", "statusBarVisibility": "Управляет видимостью строки состояния в нижней части рабочего места.", - "updateChannel": "Настройте канал обновления, по которому вы будете получать обновления. После изменения значения необходим перезапуск.", - "updateConfigurationTitle": "Обновить", + "titleBarStyle": "Настройка внешнего вида заголовка окна. Чтобы применить изменения, потребуется полный перезапуск.", "view": "Просмотреть", "windowConfigurationTitle": "Окно", "workbenchConfigurationTitle": "Workbench", diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json index fe4615c5816..66af691316c 100644 --- a/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json @@ -10,18 +10,16 @@ "addToWatchExpressions": "Добавить контрольное значение", "addWatchExpression": "Добавить выражение", "clearRepl": "Очистить консоль", - "conditionalBreakpointEditorAction": "Отладка: добавить условную точку останова…", "continueDebug": "Продолжить", "deactivateBreakpoints": "Отключить точки останова", - "debugAddToWatch": "Отладка: добавить контрольное значение", "debugConsoleAction": "Консоль отладки", - "debugEvaluate": "Отладка: вычисление", "debugFocusConsole": "Фокус консоли отладки", "disableAllBreakpoints": "Отключить все точки останова", "disconnectDebug": "Отключить", "editConditionalBreakpoint": "Изменить точку останова…", "editWatchExpression": "Изменить выражение", "enableAllBreakpoints": "Включить все точки останова", + "focusProcess": "Обработка фокуса", "launchJsonNeedsConfigurtion": "Настройте или исправьте \"launch.json\"", "openLaunchJson": "Открыть {0}", "pauseDebug": "Приостановить", @@ -34,10 +32,9 @@ "renameFunctionBreakpoint": "Переименовать точку останова в функции", "restartDebug": "Перезапустить", "restartFrame": "Перезапустить кадр", - "runToCursor": "Отладка: выполнить до текущей позиции", + "reverseContinue": "Обратно", "selectConfig": "Выбрать конфигурацию", "setValue": "Задать значение", - "showDebugHover": "Отладка: показать при наведении", "startDebug": "Начать отладку", "startWithoutDebugging": "Начать без отладки", "stepBackDebug": "На шаг назад", @@ -45,7 +42,6 @@ "stepOutDebug": "Шаг с выходом", "stepOverDebug": "Шаг с обходом", "stopDebug": "Остановить", - "toggleBreakpointAction": "Отладка: переключить точку останова", "toggleEnablement": "Включить или отключить точку останова", "unreadOutput": "Новые выходные данные в консоли отладки" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json new file mode 100644 index 00000000000..911cbed603c --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json @@ -0,0 +1,13 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "conditionalBreakpointEditorAction": "Отладка: добавить условную точку останова…", + "debugAddToWatch": "Отладка: добавить контрольное значение", + "debugEvaluate": "Отладка: вычисление", + "runToCursor": "Отладка: выполнить до текущей позиции", + "showDebugHover": "Отладка: показать при наведении", + "toggleBreakpointAction": "Отладка: переключить точку останова" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/common/debug.i18n.json new file mode 100644 index 00000000000..3babbf32c1f --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/debug/common/debug.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "noConfigurations": "Нет конфигураций" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json index 5db25837880..778bd8d24de 100644 --- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json @@ -11,9 +11,10 @@ "functionBreakpointPlaceholder": "Функция, в которой производится останов", "functionBreakpointsNotSupported": "Точки останова функций не поддерживаются в этом типе отладки", "loadMoreStackFrames": "Загрузить больше кадров стека", - "paused": "приостановлено", + "paused": "Приостановлено", + "pausedOn": "Приостановлено на {0}", "process": "Процесс", - "running": "выполняется", + "running": "Работает", "stackFrameAriaLabel": "Кадр стека {0}, строка {1} {2}, стек вызовов, отладка", "thread": "Поток", "threadAriaLabel": "Поток {0}, стек вызовов, отладка", diff --git a/i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json index 86d0b32f27f..c10abccd0cd 100644 --- a/i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debugConfigurationNames": "Конфигурации, которые будут запущены в рамках этой конфигурации \"composite\". Учитываются, только если тип конфигурации — \"composite\".", "debugLinuxConfiguration": "Атрибуты конфигурации запуска для Linux.", "debugName": "Имя конфигурации; отображается в раскрывающемся меню конфигурации запуска.", "debugOSXConfiguration": "Атрибуты конфигурации запуска для OS X.", "debugPrelaunchTask": "Задача, выполняемая перед началом сеанса отладки.", "debugRequest": "Запросите тип конфигурации. Возможные типы: \"запуск\" и \"подключение\".", + "debugServer": "Только для разработки расширений отладки: если указан порт, VS Code пытается подключиться к адаптеру отладки, запущенному в режиме сервера.", "debugType": "Тип конфигурации.", "debugWindowsConfiguration": "Атрибуты конфигурации запуска для Windows.", "internalConsoleOptions": "Управляет поведением внутренней консоли отладки.", diff --git a/i18n/rus/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json index 73afc840e5f..e59058e34a0 100644 --- a/i18n/rus/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json @@ -6,6 +6,7 @@ { "DebugConfig.failed": "Не удается создать файл launch.json в папке .vscode ({0}).", "app.launch.json.configurations": "Список конфигураций. Добавьте новые конфигурации или измените существующие с помощью IntelliSense.", + "app.launch.json.debugServer": "УСТАРЕЛО И НЕ РЕКОМЕНДУЕТСЯ: перенесите debugServer внутрь конфигурации.", "app.launch.json.title": "Запустить", "app.launch.json.version": "Версия этого формата файла.", "debugNoType": "Параметр type адаптера отладки не может быть опущен и должен иметь тип string.", diff --git a/i18n/rus/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json b/i18n/rus/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json new file mode 100644 index 00000000000..d4c16bc33a6 --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.noMatchingProviderId": "TreeExplorerNodeProvider с идентификатором {providerId} не зарегистрирован." +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json new file mode 100644 index 00000000000..8a728cb22d9 --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorer.invalidId": "Не удалось активировать расширение обозревателя с древовидным представлением {0}, оно имеет недопустимый идентификатор.", + "vscode.extension.contributes.explorer": "Добавляет в боковую панель настраиваемые деморолики по обозревателю с древовидным представлением", + "vscode.extension.contributes.explorer.icon": "Путь к значку деморолика на панели действий", + "vscode.extension.contributes.explorer.treeExplorerNodeProviderId": "Уникальный идентификатор, используемый для обозначения поставщика, зарегистрированного при помощи vscode.workspace.registerTreeExplorerNodeProvider.", + "vscode.extension.contributes.explorer.treeLabel": "Понятная для пользователей строка, используемая для отображения настраиваемого обозревателя с древовидным представлением" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json new file mode 100644 index 00000000000..a88ecead485 --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "disable": "Отключить", + "enable": "Включить", + "treeExplorer.toggle": "Включить или отключить настраиваемый обозреватель", + "view": "Просмотреть" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json new file mode 100644 index 00000000000..3eaef578513 --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "refresh": "Обновить" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/rus/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json new file mode 100644 index 00000000000..5a7dd69d972 --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "treeExplorerViewlet.tree": "Раздел обозревателя с древовидным представлением" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json new file mode 100644 index 00000000000..e22f32fb8d6 --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "Unknown Dependency": "Неизвестная зависимость:", + "error": "Ошибка" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json new file mode 100644 index 00000000000..cd734f28b26 --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json @@ -0,0 +1,39 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "JSON Validation": "Проверка JSON ({0})", + "changelog": "Журнал изменений", + "command name": "Имя", + "commands": "Команды ({0})", + "contributions": "Вклады", + "debugger name": "Имя", + "debuggers": "Отладчики ({0})", + "default": "По умолчанию", + "dependencies": "Зависимости", + "description": "Описание", + "details": "Подробности", + "extension id": "Идентификатор расширений", + "file extensions": "Расширения файлов", + "grammar": "Грамматика", + "install count": "Число установок", + "keyboard shortcuts": "&&Сочетания клавиш", + "language id": "Идентификатор", + "language name": "Имя", + "languages": "Языки ({0})", + "license": "Лицензия", + "menuContexts": "Контексты меню", + "name": "Имя расширения", + "noChangelog": "Журнал изменений недоступен.", + "noContributions": "Нет публикаций", + "noDependencies": "Нет зависимостей", + "noReadme": "Файл сведений недоступен.", + "publisher": "Имя издателя", + "rating": "Оценка", + "setting name": "Имя", + "settings": "Параметры ({0})", + "snippets": "Фрагменты", + "themes": "Темы ({0})" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json new file mode 100644 index 00000000000..5348c3a0b5f --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionTipsService.i18n.json @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "close": "Закрыть", + "neverShowAgain": "Больше не показывать", + "reallyRecommended": "Рекомендуется установить расширение \"{0}\".", + "showRecommendations": "Показать рекомендации", + "workspaceRecommended": "Эта рабочая область включает рекомендации по расширениям." +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json new file mode 100644 index 00000000000..6aa6a41de3f --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json @@ -0,0 +1,38 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "ConfigureWorkspaceRecommendations.noWorkspace": "Рекомендации доступны только для папки рабочей области.", + "OpenExtensionsFile.failed": "Не удается создать файл \"extensions.json\" в папке \".vscode\" ({0}).", + "Uninstalling": "Идет удаление", + "builtin": "Встроенное", + "clearExtensionsInput": "Очистить входные данные расширений", + "configureWorkspaceRecommendedExtensions": "Настроить рекомендуемые расширения (рабочая область)", + "disableAction": "Отключить", + "disableAlwaysAction.label": "Отключить", + "disableForWorkspaceAction": "Рабочая область", + "disableForWorkspaceAction.label": "Отключить (рабочая область)", + "disableGloballyAction": "Всегда", + "enableAction": "Включить", + "enableAlwaysAction.label": "Включить", + "enableForWorkspaceAction": "Рабочая область", + "enableForWorkspaceAction.label": "Включить (рабочая область)", + "enableGloballyAction": "Всегда", + "installAction": "Установить", + "installExtensions": "Установить расширения", + "installing": "Идет установка", + "postUninstallTooltip": "Перезагрузка для деактивации", + "reloadAction": "Перезагрузить", + "showDisabledExtensions": "Показать отключенные расширения", + "showInstalledExtensions": "Показать установленные расширения", + "showOutdatedExtensions": "Показать устаревшие расширения", + "showPopularExtensions": "Показать популярные расширения", + "showRecommendedExtensions": "Показать рекомендуемые расширения", + "showWorkspaceRecommendedExtensions": "Показать рекомендуемые расширения рабочей области", + "toggleExtensionsViewlet": "Показать расширения", + "uninstallAction": "Удалить", + "updateAction": "Обновить", + "updateAll": "Обновить все расширения" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json new file mode 100644 index 00000000000..08c5e37d6ae --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "manage": "Нажмите клавишу ВВОД для управления расширениями.", + "noExtensionsToInstall": "Введите имя расширения", + "searchFor": "Нажмите клавишу ВВОД для поиска \"{0}\" в Marketplace." +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json new file mode 100644 index 00000000000..63efc9d476b --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "app.extension.identifier.errorMessage": "Ожидается формат \"${publisher}.${name}\". Пример: \"vscode.csharp\".", + "app.extensions.json.recommendations": "Список рекомендаций по расширениям. Идентификатор расширения — всегда \"${publisher}.${name}\". Например, \"vscode.csharp\".", + "app.extensions.json.title": "Расширения" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json new file mode 100644 index 00000000000..87548ae4704 --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "extensionsInputName": "Расширение: {0}" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json index a34720eebcf..46ca27bd543 100644 --- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json @@ -4,49 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "ConfigureWorkspaceRecommendations.noWorkspace": "Рекомендации доступны только для папки рабочей области.", - "OpenExtensionsFile.failed": "Не удается создать файл \"extensions.json\" в папке \".vscode\" ({0}).", - "Uninstalling": "Идет удаление", - "builtin": "Встроенное", - "clearExtensionsInput": "Очистить входные данные расширений", - "configureWorkspaceRecommendedExtensions": "Настроить рекомендуемые расширения (рабочая область)", - "disableAction": "Отключить", - "disableAll": "Отключить все", - "disableAllWorkspace": "Отключить все (рабочая область)", - "disableAlwaysAction.label": "Отключить", - "disableForWorkspaceAction": "Рабочая область", - "disableForWorkspaceAction.label": "Отключить (рабочая область)", - "disableGloballyAction": "Всегда", - "enableAction": "Включить", - "enableAll": "Включить все", - "enableAllWorkspace": "Включить все (рабочая область)", - "enableAlwaysAction.label": "Включить", - "enableForWorkspaceAction": "Рабочая область", - "enableForWorkspaceAction.label": "Включить (рабочая область)", - "enableGloballyAction": "Всегда", - "installAction": "Установить", - "installExtensions": "Установить расширения", + "InstallVSIXAction.reloadNow": "Перезагрузить", + "InstallVSIXAction.success": "Расширение установлено. Чтобы включить его, выполните перезапуск.", "installVSIX": "Установка из VSIX...", - "installing": "Идет установка", - "openExtensionsFolder": "Открыть папку расширений", - "postDisableMessage": "Перезагрузить это окно, чтобы отключить расширение \"{0}\"?", - "postDisableTooltip": "Перезагрузка для отключения", - "postEnableMessage": "Перезагрузить это окно, чтобы включить расширение \"{0}\"?", - "postEnableTooltip": "Перезагрузка для включения", - "postInstallMessage": "Перезагрузить это окно, чтобы активировать расширение \"{0}\"?", - "postInstallTooltip": "Перезагрузка для активации", - "postUninstallMessage": "Перезагрузить это окно, чтобы деактивировать расширение \"{0}\"?", - "postUninstallTooltip": "Перезагрузка для деактивации", - "reloadAction": "Перезагрузить", - "reloadNow": "Перезагрузить сейчас", - "showDisabledExtensions": "Показать отключенные расширения", - "showInstalledExtensions": "Показать установленные расширения", - "showOutdatedExtensions": "Показать устаревшие расширения", - "showPopularExtensions": "Показать популярные расширения", - "showRecommendedExtensions": "Показать рекомендуемые расширения", - "showWorkspaceRecommendedExtensions": "Показать рекомендуемые расширения рабочей области", - "toggleExtensionsViewlet": "Показать расширения", - "uninstallAction": "Удалить", - "updateAction": "Обновить", - "updateAll": "Обновить все расширения" + "openExtensionsFolder": "Открыть папку расширений" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json index 14303b62049..86d1d46b360 100644 --- a/i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json @@ -20,10 +20,11 @@ "files.exclude.when": "Дополнительная проверка элементов того же уровня соответствующего файла. Используйте $(basename) в качестве переменной для соответствующего имени файла.", "filesConfigurationTitle": "Файлы", "formatOnSave": "Форматирование файла при сохранении. Модуль форматирования должен быть доступен, файл не должен сохраняться автоматически, а работа редактора не должна завершаться.", + "insertFinalNewline": "Если этот параметр включен, при сохранении файла в его конец вставляется финальная новая строка.", "openEditorsVisible": "Число редакторов, отображаемых на панели открытых редакторов. Задайте значение 0, чтобы скрыть панель.", "showExplorerViewlet": "Показать проводник", "textFileEditor": "Редактор текстовых файлов", - "trimTrailingWhitespace": "Если этот параметр включен, при сохранении файла будут удалены завершающие символы-разделители.", + "trimTrailingWhitespace": "Если этот параметр включен, при сохранении файла будут удалены концевые пробелы.", "view": "Просмотреть", "watcherExclude": "Настройте стандартные маски путей файлов, чтобы исключить их из списка отслеживаемых файлов. После изменения этого параметра потребуется перезагрузка. При отображении сообщения \"Код потребляет большое количество процессорного времени при запуске\" вы можете исключить большие папки, чтобы уменьшить первоначальную загрузку." } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/rus/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json index db2109bd84e..5ae6426a476 100644 --- a/i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "errors.warnings.show.label": "Ошибки и предупреждения", + "errors.warnings.show.label": "Показать ошибки и предупреждения", "markers.panel.action.filter": "Фильтр проблем", "markers.panel.aria.label.problems.tree": "Проблемы, сгруппированные по файлам", "markers.panel.at.ln.col.number": "({0}, {1})", @@ -25,15 +25,15 @@ "markers.panel.title.problems": "Проблемы", "problems.panel.configuration.autoreveal": "Определяет, следует ли представлению \"Проблемы\" отображать файлы при их открытии", "problems.panel.configuration.title": "Представление \"Проблемы\"", - "problems.tree.aria.label.error.marker": "Ошибка, созданная {0}: {1} в строке {2} и столбце {3}", - "problems.tree.aria.label.error.marker.nosource": "Ошибка: {0} в строке {1} и столбце {2}", - "problems.tree.aria.label.info.marker": "Сообщение, созданное {0}: {1} в строке {2} и столбце {3}", - "problems.tree.aria.label.info.marker.nosource": "Сообщение: {0} в строке {1} и столбце {2}", - "problems.tree.aria.label.marker": "Проблема, созданная {0}: {1} в строке {2} и столбце {3}", - "problems.tree.aria.label.marker.nosource": "Проблема: {0} в строке {1} и столбце {2}", + "problems.tree.aria.label.error.marker": "Ошибка, созданная {0}: {1} в строке {2} и символе {3}", + "problems.tree.aria.label.error.marker.nosource": "Ошибка: {0} в строке {1} и символе {2}", + "problems.tree.aria.label.info.marker": "Информационное сообщение, созданное {0}: {1} в строке {2} и символе {3}", + "problems.tree.aria.label.info.marker.nosource": "Информационное сообщение: {0} в строке {1} и символе {2}", + "problems.tree.aria.label.marker": "Проблема, созданная {0}: {1} в строке {2} и символе {3}", + "problems.tree.aria.label.marker.nosource": "Проблема: {0} в строке {1} и символе {2}", "problems.tree.aria.label.resource": "{0} с проблемами ({1})", - "problems.tree.aria.label.warning.marker": "Предупреждение, созданное {0}: {1} в строке {2} и столбце {3}", - "problems.tree.aria.label.warning.marker.nosource": "Предупреждение: {0} в строке {1} и столбце {2}", + "problems.tree.aria.label.warning.marker": "Предупреждение, созданное {0}: {1} в строке {2} и символе {3}", + "problems.tree.aria.label.warning.marker.nosource": "Предупреждение: {0} в строке {1} и символе {2}", "problems.view.show.label": "Показать проблемы", "viewCategory": "Просмотреть" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json new file mode 100644 index 00000000000..7936529b8df --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/nps/browser/nps.contribution.i18n.json @@ -0,0 +1,11 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "neverAgain": "Больше не показывать", + "remindLater": "Напомнить мне позже", + "surveyQuestion": "Вас не затруднит пройти краткий опрос?", + "takeSurvey": "Пройти опрос" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json index ba592584cdd..7f500eda4f9 100644 --- a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json @@ -25,12 +25,12 @@ "JsonSchema.options.cwd": "Текущий рабочий каталог выполняемой программы или сценария. Если этот параметр опущен, используется корневой каталог текущей рабочей области Code.", "JsonSchema.options.env": "Среда выполняемой программы или оболочки. Если этот параметр опущен, используется среда родительского процесса.", "JsonSchema.pattern.code": "Индекс группы сопоставления для кода проблемы. По умолчанию не определен.", - "JsonSchema.pattern.column": "Индекс группы сопоставления для столбца проблемы. Значение по умолчанию — 3", - "JsonSchema.pattern.endColumn": "Индекс группы сопоставления для конечного столбца проблемы. По умолчанию не определен.", + "JsonSchema.pattern.column": "Индекс группы сопоставления для символа в строке проблемы. Значение по умолчанию — 3.", + "JsonSchema.pattern.endColumn": "Индекс группы сопоставления для конечного символа проблемы. По умолчанию не определен.", "JsonSchema.pattern.endLine": "Индекс группы сопоставления для конечной строки проблемы. По умолчанию не определен.", "JsonSchema.pattern.file": "Индекс группы сопоставления для имени файла. Если он не указан, используется значение 1.", "JsonSchema.pattern.line": "Индекс группы сопоставления для строки проблемы. Значение по умолчанию — 2.", - "JsonSchema.pattern.location": "Индекс группы сопоставления для расположения проблемы. Допустимые шаблоны расположения: (строка), (строка,столбец) и (начальная_строка,начальный_столбец,конечная_строка,конечный_столбец). Если индекс не указан, предполагается строка и столбец.", + "JsonSchema.pattern.location": "Индекс группы сопоставления для расположения проблемы. Допустимые шаблоны расположения: (строка), (строка,столбец) и (начальная_строка,начальный_столбец,конечная_строка,конечный_столбец). Если индекс не указан, предполагается шаблон (строка,столбец).", "JsonSchema.pattern.loop": "В цикле многострочного сопоставителя указывает, выполняется ли этот шаблон в цикле, пока он соответствует. Может указываться только для последнего шаблона в многострочном шаблоне.", "JsonSchema.pattern.message": "Индекс группы сопоставления для сообщения. Если он не указан, значение по умолчанию — 4 при незаданном расположении. В противном случае значение по умолчанию — 5.", "JsonSchema.pattern.regexp": "Регулярное выражение для поиска ошибки, предупреждения или информации в выходных данных.", @@ -69,7 +69,7 @@ "RunTaskAction.label": "Выполнить задачу", "ShowLogAction.label": "Показать журнал задач", "TaskSystem.active": "В настоящий момент есть активная выполняющаяся задача. Завершите ее, прежде чем выполнять другую задачу.", - "TaskSystem.activeSame": "Задача уже активна и находится в режиме наблюдения.", + "TaskSystem.activeSame": "Задача уже активна и находится в режиме наблюдения. Чтобы завершить задачу, выполните команду \"F1 > terminate task\".", "TaskSystem.exitAnyways": "&&Выйти", "TaskSystem.invalidTaskJson": "Ошибка: в содержимом файла tasks.json есть синтаксические ошибки. Исправьте их, прежде чем выполнять задачу.\n", "TaskSystem.noBuildType": "Допустимое средство запуска задач не настроено. Поддерживаемые средства запуска задач: \"служба\" и \"программа\".", diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json index ad6a7e9f40d..7af894053c2 100644 --- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json @@ -5,5 +5,6 @@ // Do not edit this file. It is machine generated. { "terminal.integrated.copySelection.noSelection": "Невозможно скопировать выделение в терминале, когда терминал не имеет фокуса", - "terminal.integrated.exitedWithCode": "Процесс терминала завершен с кодом выхода: {0}" + "terminal.integrated.exitedWithCode": "Процесс терминала завершен с кодом выхода: {0}", + "terminal.integrated.launchFailed": "Не удалось запустить команду процесса терминала \"{0}{1}\" (код выхода: {2})" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/services/history/browser/history.i18n.json b/i18n/rus/src/vs/workbench/services/history/browser/history.i18n.json index 36aa5b78180..03570e90b18 100644 --- a/i18n/rus/src/vs/workbench/services/history/browser/history.i18n.json +++ b/i18n/rus/src/vs/workbench/services/history/browser/history.i18n.json @@ -5,7 +5,7 @@ // Do not edit this file. It is machine generated. { "devExtensionWindowTitle": "[Узел разработки расширения] — {0}", - "patchedWindowTitle": " [Не поддерживается]", + "patchedWindowTitle": "[Не поддерживается]", "prefixDecoration": "● {0}", "prefixTitle": "{0} — {1}", "prefixWorkspaceTitle": "{0} — {1} — {2}", diff --git a/i18n/rus/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/rus/src/vs/workbench/services/message/browser/messageList.i18n.json new file mode 100644 index 00000000000..e5230eb6365 --- /dev/null +++ b/i18n/rus/src/vs/workbench/services/message/browser/messageList.i18n.json @@ -0,0 +1,14 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "alertErrorMessage": "Ошибка: {0}", + "alertInfoMessage": "Сведения: {0}", + "alertWarningMessage": "Предупреждение: {0}", + "close": "Закрыть", + "error": "Ошибка", + "info": "Сведения", + "warning": "Предупреждение" +} \ No newline at end of file diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop index 4e82b76f7a2..80d41601b7b 100644 --- a/resources/linux/code.desktop +++ b/resources/linux/code.desktop @@ -8,7 +8,7 @@ Type=Application StartupNotify=true StartupWMClass=@@NAME_SHORT@@ Categories=Utility;TextEditor;Development;IDE; -MimeType=text/plain; +MimeType=text/plain;inode/directory; Actions=new-window; Keywords=vscode; diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts index 1358581bf0d..7484c4dc5fe 100644 --- a/src/vs/code/electron-main/menus.ts +++ b/src/vs/code/electron-main/menus.ts @@ -537,7 +537,7 @@ export class VSCodeMenu { const commands = this.createMenuItem(nls.localize({ key: 'miCommandPalette', comment: ['&& denotes a mnemonic'] }, "&&Command Palette..."), 'workbench.action.showCommands'); const fullscreen = new MenuItem({ label: mnemonicLabel(nls.localize({ key: 'miToggleFullScreen', comment: ['&& denotes a mnemonic'] }, "Toggle &&Full Screen")), accelerator: this.getAccelerator('workbench.action.toggleFullScreen'), click: () => this.windowsService.getLastActiveWindow().toggleFullScreen(), enabled: this.windowsService.getWindowCount() > 0 }); - const toggleZenMode = this.createMenuItem(nls.localize('miToggleZenMode', "Toggle Zen Mode"), 'workbench.action.toggleZenMode', this.windowsService.getWindowCount() > 0); + const toggleFocusMode = this.createMenuItem(nls.localize('miToggleFocusMode', "Toggle Focus Mode"), 'workbench.action.toggleFocusMode', this.windowsService.getWindowCount() > 0); const toggleMenuBar = this.createMenuItem(nls.localize({ key: 'miToggleMenuBar', comment: ['&& denotes a mnemonic'] }, "Toggle Menu &&Bar"), 'workbench.action.toggleMenuBar'); const splitEditor = this.createMenuItem(nls.localize({ key: 'miSplitEditor', comment: ['&& denotes a mnemonic'] }, "Split &&Editor"), 'workbench.action.splitEditor'); const toggleEditorLayout = this.createMenuItem(nls.localize({ key: 'miToggleEditorLayout', comment: ['&& denotes a mnemonic'] }, "Toggle Editor Group &&Layout"), 'workbench.action.toggleEditorGroupLayout'); @@ -593,7 +593,7 @@ export class VSCodeMenu { integratedTerminal, __separator__(), fullscreen, - toggleZenMode, + toggleFocusMode, platform.isWindows || platform.isLinux ? toggleMenuBar : void 0, __separator__(), splitEditor, @@ -732,7 +732,7 @@ export class VSCodeMenu { product.documentationUrl ? new MenuItem({ label: mnemonicLabel(nls.localize({ key: 'miDocumentation', comment: ['&& denotes a mnemonic'] }, "&&Documentation")), click: () => this.openUrl(product.documentationUrl, 'openDocumentationUrl') }) : null, product.releaseNotesUrl ? new MenuItem({ label: mnemonicLabel(nls.localize({ key: 'miReleaseNotes', comment: ['&& denotes a mnemonic'] }, "&&Release Notes")), click: () => this.windowsService.sendToFocused('vscode:runAction', 'update.showCurrentReleaseNotes') }) : null, (product.documentationUrl || product.releaseNotesUrl) ? __separator__() : null, - keyboardShortcutsUrl ? new MenuItem({ label: mnemonicLabel(nls.localize({ key: 'miKeyboardShortcuts', comment: ['&& denotes a mnemonic'] }, "&&Keyboard Shortcuts Reference")), click: () => this.openUrl(keyboardShortcutsUrl, 'openKeyboardShortcutsUrl') }) : null, + keyboardShortcutsUrl ? new MenuItem({ label: mnemonicLabel(nls.localize({ key: 'miKeyboardShortcuts', comment: ['&& denotes a mnemonic'] }, "&&Keyboard Shortcuts Reference")), click: () => this.windowsService.sendToFocused('vscode:runAction', 'workbench.action.keybindingsReference') }) : null, product.introductoryVideosUrl ? new MenuItem({ label: mnemonicLabel(nls.localize({ key: 'miIntroductoryVideos', comment: ['&& denotes a mnemonic'] }, "Introductory &&Videos")), click: () => this.openUrl(product.introductoryVideosUrl, 'openIntroductoryVideosUrl') }) : null, (product.introductoryVideosUrl || keyboardShortcutsUrl) ? __separator__() : null, product.twitterUrl ? new MenuItem({ label: mnemonicLabel(nls.localize({ key: 'miTwitter', comment: ['&& denotes a mnemonic'] }, "&&Join us on Twitter")), click: () => this.openUrl(product.twitterUrl, 'openTwitterUrl') }) : null, diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts index 19e35924794..ce1d625d7a8 100644 --- a/src/vs/editor/browser/controller/mouseTarget.ts +++ b/src/vs/editor/browser/controller/mouseTarget.ts @@ -167,7 +167,7 @@ let REGEX = (function () { IS_CHILD_OF_CONTENT_WIDGETS: createRegExp(anyNode(), anyNode(), ClassNames.CONTENT_WIDGETS), IS_CHILD_OF_OVERFLOWING_CONTENT_WIDGETS: new RegExp('^' + ClassNames.OVERFLOWING_CONTENT_WIDGETS + '\\/'), IS_CHILD_OF_OVERLAY_WIDGETS: createRegExp(ClassNames.OVERLAY_WIDGETS), - IS_CHILD_OF_VIEW_OVERLAYS: createRegExp(ClassNames.MARGIN_VIEW_OVERLAYS), + IS_CHILD_OF_MARGIN: createRegExp(ClassNames.MARGIN), IS_CHILD_OF_VIEW_ZONES: createRegExp(anyNode(), anyNode(), ClassNames.VIEW_ZONES), }; })(); @@ -357,7 +357,7 @@ export class MouseTargetFactory { return this.createMouseTargetFromScrollbar(t, mouseVerticalOffset, mouseColumn); } - if (REGEX.IS_CHILD_OF_VIEW_OVERLAYS.test(path)) { + if (REGEX.IS_CHILD_OF_MARGIN.test(path)) { let offset = Math.abs(e.posx - e.editorPos.left); if (offset <= layoutInfo.glyphMarginWidth) { diff --git a/src/vs/editor/browser/editorBrowser.ts b/src/vs/editor/browser/editorBrowser.ts index 0856aec1e26..87423b3d387 100644 --- a/src/vs/editor/browser/editorBrowser.ts +++ b/src/vs/editor/browser/editorBrowser.ts @@ -154,6 +154,7 @@ export const ClassNames = { OVERFLOWING_CONTENT_WIDGETS: 'overflowingContentWidgets', OVERLAY_WIDGETS: 'overlayWidgets', MARGIN_VIEW_OVERLAYS: 'margin-view-overlays', + MARGIN: 'margin', LINE_NUMBERS: 'line-numbers', GLYPH_MARGIN: 'glyph-margin', SCROLL_DECORATION: 'scroll-decoration', @@ -211,6 +212,10 @@ export interface IViewZone { * The dom node of the view zone */ domNode: HTMLElement; + /** + * An optional dom node for the view zone that will be placed in the margin area. + */ + marginDomNode?: HTMLElement; /** * Callback which gives the relative top of the view zone as it appears (taking scrolling into account). */ diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts index 1fbd5555b60..bd0d82dc9b8 100644 --- a/src/vs/editor/browser/view/viewImpl.ts +++ b/src/vs/editor/browser/view/viewImpl.ts @@ -25,12 +25,15 @@ import { ContentViewOverlays, MarginViewOverlays } from 'vs/editor/browser/view/ import { LayoutProvider } from 'vs/editor/browser/viewLayout/layoutProvider'; import { ViewContentWidgets } from 'vs/editor/browser/viewParts/contentWidgets/contentWidgets'; import { CurrentLineHighlightOverlay } from 'vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight'; +import { CurrentLineMarginHighlightOverlay } from 'vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight'; import { DecorationsOverlay } from 'vs/editor/browser/viewParts/decorations/decorations'; import { GlyphMarginOverlay } from 'vs/editor/browser/viewParts/glyphMargin/glyphMargin'; import { LineNumbersOverlay } from 'vs/editor/browser/viewParts/lineNumbers/lineNumbers'; import { IndentGuidesOverlay } from 'vs/editor/browser/viewParts/indentGuides/indentGuides'; import { ViewLines } from 'vs/editor/browser/viewParts/lines/viewLines'; +import { Margin } from 'vs/editor/browser/viewParts/margin/margin'; import { LinesDecorationsOverlay } from 'vs/editor/browser/viewParts/linesDecorations/linesDecorations'; +import { MarginViewLineDecorationsOverlay } from 'vs/editor/browser/viewParts/marginDecorations/marginDecorations'; import { ViewOverlayWidgets } from 'vs/editor/browser/viewParts/overlayWidgets/overlayWidgets'; import { DecorationsOverviewRuler } from 'vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler'; import { OverviewRuler } from 'vs/editor/browser/viewParts/overviewRuler/overviewRuler'; @@ -236,10 +239,16 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp let marginViewOverlays = new MarginViewOverlays(this._context, this.layoutProvider); this.viewParts.push(marginViewOverlays); + marginViewOverlays.addDynamicOverlay(new CurrentLineMarginHighlightOverlay(this._context, this.layoutProvider)); marginViewOverlays.addDynamicOverlay(new GlyphMarginOverlay(this._context)); + marginViewOverlays.addDynamicOverlay(new MarginViewLineDecorationsOverlay(this._context)); marginViewOverlays.addDynamicOverlay(new LinesDecorationsOverlay(this._context)); marginViewOverlays.addDynamicOverlay(new LineNumbersOverlay(this._context)); + let margin = new Margin(this._context, this.layoutProvider); + margin.domNode.appendChild(this.viewZones.marginDomNode); + margin.domNode.appendChild(marginViewOverlays.getDomNode()); + this.viewParts.push(margin); // Content widgets this.contentWidgets = new ViewContentWidgets(this._context, this.domNode); @@ -271,7 +280,7 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp this.linesContent.appendChild(this.viewLines.getDomNode()); this.linesContent.appendChild(this.contentWidgets.domNode); this.linesContent.appendChild(this.viewCursors.getDomNode()); - this.overflowGuardContainer.appendChild(marginViewOverlays.getDomNode()); + this.overflowGuardContainer.appendChild(margin.domNode); this.overflowGuardContainer.appendChild(this.linesContentContainer); this.overflowGuardContainer.appendChild(scrollDecoration.getDomNode()); this.overflowGuardContainer.appendChild(this.overlayWidgets.domNode); diff --git a/src/vs/editor/browser/view/viewLayer.ts b/src/vs/editor/browser/view/viewLayer.ts index 8d030f5cafb..043af702faf 100644 --- a/src/vs/editor/browser/view/viewLayer.ts +++ b/src/vs/editor/browser/view/viewLayer.ts @@ -257,8 +257,7 @@ export abstract class ViewLayer extends ViewPart { this._scrollDomNodeIsAbove = false; this._renderer = new ViewLayerRenderer( - () => this._createLine(), - () => this._extraDomNodeHTML() + () => this._createLine() ); } @@ -267,10 +266,6 @@ export abstract class ViewLayer extends ViewPart { this._linesCollection = null; } - protected _extraDomNodeHTML(): string { - return ''; - } - // ---- begin view event handlers public onConfigurationChanged(e: editorCommon.IConfigurationChangedEvent): boolean { @@ -381,11 +376,9 @@ export abstract class ViewLayer extends ViewPart { class ViewLayerRenderer { private _createLine: () => T; - private _extraDomNodeHTML: () => string; - constructor(createLine: () => T, extraDomNodeHTML: () => string) { + constructor(createLine: () => T) { this._createLine = createLine; - this._extraDomNodeHTML = extraDomNodeHTML; } public renderWithManyUpdates(ctx: IRendererContext, startLineNumber: number, stopLineNumber: number, deltaTop: number[]): IRendererContext { @@ -594,7 +587,7 @@ class ViewLayerRenderer { private _finishRenderingNewLines(ctx: IRendererContext, domNodeIsEmpty: boolean, newLinesHTML: string[], wasNew: boolean[]): void { let lastChild = ctx.domNode.lastChild; if (domNodeIsEmpty || !lastChild) { - ctx.domNode.innerHTML = this._extraDomNodeHTML() + newLinesHTML.join(''); + ctx.domNode.innerHTML = newLinesHTML.join(''); } else { lastChild.insertAdjacentHTML('afterend', newLinesHTML.join('')); } diff --git a/src/vs/editor/browser/view/viewOverlays.ts b/src/vs/editor/browser/view/viewOverlays.ts index 2d7bb97988d..365ce8d81c4 100644 --- a/src/vs/editor/browser/view/viewOverlays.ts +++ b/src/vs/editor/browser/view/viewOverlays.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { StyleMutator, FastDomNode, createFastDomNode } from 'vs/base/browser/styleMutator'; +import { FastDomNode, createFastDomNode } from 'vs/base/browser/styleMutator'; import { IScrollEvent, IConfigurationChangedEvent, EditorLayoutInfo } from 'vs/editor/common/editorCommon'; import * as editorBrowser from 'vs/editor/browser/editorBrowser'; import { IVisibleLineData, ViewLayer } from 'vs/editor/browser/view/viewLayer'; @@ -218,54 +218,26 @@ export class ContentViewOverlays extends ViewOverlays { export class MarginViewOverlays extends ViewOverlays { - private _glyphMarginLeft: number; - private _glyphMarginWidth: number; - private _scrollHeight: number; private _contentLeft: number; private _canUseTranslate3d: boolean; constructor(context: ViewContext, layoutProvider: ILayoutProvider) { super(context, layoutProvider); - this._glyphMarginLeft = context.configuration.editor.layoutInfo.glyphMarginLeft; - this._glyphMarginWidth = context.configuration.editor.layoutInfo.glyphMarginWidth; - this._scrollHeight = layoutProvider.getScrollHeight(); this._contentLeft = context.configuration.editor.layoutInfo.contentLeft; this._canUseTranslate3d = context.configuration.editor.viewInfo.canUseTranslate3d; - this.domNode.setClassName(editorBrowser.ClassNames.MARGIN_VIEW_OVERLAYS + ' monaco-editor-background'); + this.domNode.setClassName(editorBrowser.ClassNames.MARGIN_VIEW_OVERLAYS); this.domNode.setWidth(1); Configuration.applyFontInfo(this.domNode, this._context.configuration.editor.fontInfo); } - protected _extraDomNodeHTML(): string { - return [ - '
' - ].join(''); - } - - private _getGlyphMarginDomNode(): HTMLElement { - return this.domNode.domNode.children[0]; - } - public onScrollChanged(e: IScrollEvent): boolean { - this._scrollHeight = e.scrollHeight; return super.onScrollChanged(e) || e.scrollHeightChanged; } public onLayoutChanged(layoutInfo: EditorLayoutInfo): boolean { - this._glyphMarginLeft = layoutInfo.glyphMarginLeft; - this._glyphMarginWidth = layoutInfo.glyphMarginWidth; - this._scrollHeight = this._layoutProvider.getScrollHeight(); this._contentLeft = layoutInfo.contentLeft; return super.onLayoutChanged(layoutInfo) || true; } @@ -283,23 +255,8 @@ export class MarginViewOverlays extends ViewOverlays { _viewOverlaysRender(ctx: IRestrictedRenderingContext): void { super._viewOverlaysRender(ctx); - if (this._canUseTranslate3d) { - let transform = 'translate3d(0px, ' + ctx.linesViewportData.visibleRangesDeltaTop + 'px, 0px)'; - this.domNode.setTransform(transform); - this.domNode.setTop(0); - } else { - this.domNode.setTransform(''); - this.domNode.setTop(ctx.linesViewportData.visibleRangesDeltaTop); - } let height = Math.min(this._layoutProvider.getTotalHeight(), 1000000); this.domNode.setHeight(height); this.domNode.setWidth(this._contentLeft); - - let glyphMargin = this._getGlyphMarginDomNode(); - if (glyphMargin) { - StyleMutator.setHeight(glyphMargin, this._scrollHeight); - StyleMutator.setLeft(glyphMargin, this._glyphMarginLeft); - StyleMutator.setWidth(glyphMargin, this._glyphMarginWidth); - } } } \ No newline at end of file diff --git a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts index a55fd3dfb23..4c80585ed8d 100644 --- a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts +++ b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts @@ -16,7 +16,7 @@ export class CurrentLineHighlightOverlay extends DynamicViewOverlay { private _context: ViewContext; private _lineHeight: number; private _readOnly: boolean; - private _renderLineHighlight: boolean; + private _renderLineHighlight: 'none' | 'gutter' | 'line' | 'all'; private _layoutProvider: ILayoutProvider; private _selectionIsEmpty: boolean; private _primaryCursorIsInEditableRange: boolean; @@ -134,6 +134,8 @@ export class CurrentLineHighlightOverlay extends DynamicViewOverlay { } private _shouldShowCurrentLine(): boolean { - return this._renderLineHighlight && this._selectionIsEmpty && this._primaryCursorIsInEditableRange; + return (this._renderLineHighlight === 'line' || this._renderLineHighlight === 'all') && + this._selectionIsEmpty && + this._primaryCursorIsInEditableRange; } } diff --git a/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.css b/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.css new file mode 100644 index 00000000000..9ab0a39ef65 --- /dev/null +++ b/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.css @@ -0,0 +1,24 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +.monaco-editor .current-line { + display: block; + position: absolute; + left: 0; + top: 0; + box-sizing: border-box; +} + +.monaco-editor.vs .current-line { + border: 2px solid #eee; +} + +.monaco-editor.vs-dark .current-line { + border: 2px solid #282828; +} + +.monaco-editor.hc-black .current-line { + border: 2px solid #f38518; +} diff --git a/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts b/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts new file mode 100644 index 00000000000..ab422810c5c --- /dev/null +++ b/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts @@ -0,0 +1,112 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import 'vs/css!./currentLineMarginHighlight'; +import * as editorCommon from 'vs/editor/common/editorCommon'; +import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay'; +import { ViewContext } from 'vs/editor/common/view/viewContext'; +import { IRenderingContext } from 'vs/editor/common/view/renderingContext'; +import { ILayoutProvider } from 'vs/editor/browser/viewLayout/layoutProvider'; + +export class CurrentLineMarginHighlightOverlay extends DynamicViewOverlay { + private _context: ViewContext; + private _lineHeight: number; + private _renderLineHighlight: 'none' | 'gutter' | 'line' | 'all'; + private _layoutProvider: ILayoutProvider; + private _primaryCursorIsInEditableRange: boolean; + private _primaryCursorLineNumber: number; + private _contentLeft: number; + + constructor(context: ViewContext, layoutProvider: ILayoutProvider) { + super(); + this._context = context; + this._lineHeight = this._context.configuration.editor.lineHeight; + this._renderLineHighlight = this._context.configuration.editor.viewInfo.renderLineHighlight; + + this._layoutProvider = layoutProvider; + + this._primaryCursorIsInEditableRange = true; + this._primaryCursorLineNumber = 1; + this._contentLeft = this._context.configuration.editor.layoutInfo.contentLeft; + + this._context.addEventHandler(this); + } + + public dispose(): void { + this._context.removeEventHandler(this); + this._context = null; + } + + // --- begin event handlers + + public onModelFlushed(): boolean { + this._primaryCursorIsInEditableRange = true; + this._primaryCursorLineNumber = 1; + return true; + } + public onModelLinesDeleted(e: editorCommon.IViewLinesDeletedEvent): boolean { + return true; + } + public onModelLinesInserted(e: editorCommon.IViewLinesInsertedEvent): boolean { + return true; + } + public onCursorPositionChanged(e: editorCommon.IViewCursorPositionChangedEvent): boolean { + let hasChanged = false; + if (this._primaryCursorIsInEditableRange !== e.isInEditableRange) { + this._primaryCursorIsInEditableRange = e.isInEditableRange; + hasChanged = true; + } + if (this._primaryCursorLineNumber !== e.position.lineNumber) { + this._primaryCursorLineNumber = e.position.lineNumber; + hasChanged = true; + } + return hasChanged; + } + public onConfigurationChanged(e: editorCommon.IConfigurationChangedEvent): boolean { + if (e.lineHeight) { + this._lineHeight = this._context.configuration.editor.lineHeight; + } + if (e.viewInfo.renderLineHighlight) { + this._renderLineHighlight = this._context.configuration.editor.viewInfo.renderLineHighlight; + } + if (e.layoutInfo) { + this._contentLeft = this._context.configuration.editor.layoutInfo.contentLeft; + } + return true; + } + public onLayoutChanged(layoutInfo: editorCommon.EditorLayoutInfo): boolean { + return true; + } + public onZonesChanged(): boolean { + return true; + } + // --- end event handlers + + public prepareRender(ctx: IRenderingContext): void { + } + + public render(startLineNumber: number, lineNumber: number): string { + if (lineNumber === this._primaryCursorLineNumber) { + if (this._shouldShowCurrentLine()) { + return ( + '
' + ); + } else { + return ''; + } + } + return ''; + } + + private _shouldShowCurrentLine(): boolean { + return (this._renderLineHighlight === 'gutter' || this._renderLineHighlight === 'all') && this._primaryCursorIsInEditableRange; + } +} diff --git a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.css b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.css index 3339c59acd3..474a00605c1 100644 --- a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.css +++ b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.css @@ -10,6 +10,7 @@ vertical-align: middle; box-sizing: border-box; cursor: default; + height: 100%; } .monaco-editor .relative-current-line-number { diff --git a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts index d3dfaae05f9..f86cffc5ab7 100644 --- a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts +++ b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts @@ -97,20 +97,15 @@ export class LineNumbersOverlay extends DynamicViewOverlay { // --- end event handlers public prepareRender(ctx: IRenderingContext): void { - if (!this.shouldRender()) { - throw new Error('I did not ask to render!'); - } - if (!this._renderLineNumbers) { this._renderResult = null; return; } let lineHeightClassName = (platform.isLinux ? (this._lineHeight % 2 === 0 ? ' lh-even' : ' lh-odd') : ''); - let lineHeight = this._lineHeight.toString(); let visibleStartLineNumber = ctx.visibleRange.startLineNumber; let visibleEndLineNumber = ctx.visibleRange.endLineNumber; - let common = '
'; + let common = '
'; let output: string[] = []; for (let lineNumber = visibleStartLineNumber; lineNumber <= visibleEndLineNumber; lineNumber++) { diff --git a/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.css b/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.css index c0a5f0d205a..452d83eeb8b 100644 --- a/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.css +++ b/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.css @@ -14,4 +14,5 @@ */ .monaco-editor .margin-view-overlays .cldr { position: absolute; + height: 100%; } \ No newline at end of file diff --git a/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts b/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts index 1308f188f6d..3517c9f31b4 100644 --- a/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts +++ b/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts @@ -14,7 +14,6 @@ import { IRenderingContext } from 'vs/editor/common/view/renderingContext'; export class LinesDecorationsOverlay extends DedupOverlay { private _context: ViewContext; - private _lineHeight: number; private _decorationsLeft: number; private _decorationsWidth: number; @@ -23,7 +22,6 @@ export class LinesDecorationsOverlay extends DedupOverlay { constructor(context: ViewContext) { super(); this._context = context; - this._lineHeight = this._context.configuration.editor.lineHeight; this._decorationsLeft = 0; this._decorationsWidth = 0; this._renderResult = null; @@ -63,9 +61,6 @@ export class LinesDecorationsOverlay extends DedupOverlay { return false; } public onConfigurationChanged(e: editorCommon.IConfigurationChangedEvent): boolean { - if (e.lineHeight) { - this._lineHeight = this._context.configuration.editor.lineHeight; - } return true; } public onLayoutChanged(layoutInfo: editorCommon.EditorLayoutInfo): boolean { @@ -95,18 +90,13 @@ export class LinesDecorationsOverlay extends DedupOverlay { } public prepareRender(ctx: IRenderingContext): void { - if (!this.shouldRender()) { - throw new Error('I did not ask to render!'); - } - let visibleStartLineNumber = ctx.visibleRange.startLineNumber; let visibleEndLineNumber = ctx.visibleRange.endLineNumber; let toRender = this._render(visibleStartLineNumber, visibleEndLineNumber, this._getDecorations(ctx)); - let lineHeight = this._lineHeight.toString(); let left = this._decorationsLeft.toString(); let width = this._decorationsWidth.toString(); - let common = '" style="left:' + left + 'px;width:' + width + 'px' + ';height:' + lineHeight + 'px;">
'; + let common = '" style="left:' + left + 'px;width:' + width + 'px;">
'; let output: string[] = []; for (let lineNumber = visibleStartLineNumber; lineNumber <= visibleEndLineNumber; lineNumber++) { @@ -126,10 +116,6 @@ export class LinesDecorationsOverlay extends DedupOverlay { if (!this._renderResult) { return ''; } - let lineIndex = lineNumber - startLineNumber; - if (lineIndex < 0 || lineIndex >= this._renderResult.length) { - throw new Error('Unexpected render request'); - } - return this._renderResult[lineIndex]; + return this._renderResult[lineNumber - startLineNumber]; } } \ No newline at end of file diff --git a/src/vs/editor/browser/viewParts/margin/margin.ts b/src/vs/editor/browser/viewParts/margin/margin.ts new file mode 100644 index 00000000000..3ff433c51a0 --- /dev/null +++ b/src/vs/editor/browser/viewParts/margin/margin.ts @@ -0,0 +1,100 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import { StyleMutator, FastDomNode, createFastDomNode } from 'vs/base/browser/styleMutator'; +import * as editorCommon from 'vs/editor/common/editorCommon'; +import { ClassNames } from 'vs/editor/browser/editorBrowser'; +import { ViewPart } from 'vs/editor/browser/view/viewPart'; +import { ViewContext } from 'vs/editor/common/view/viewContext'; +import { IRenderingContext, IRestrictedRenderingContext } from 'vs/editor/common/view/renderingContext'; +import { ILayoutProvider } from 'vs/editor/browser/viewLayout/layoutProvider'; + +export class Margin extends ViewPart { + public domNode: HTMLElement; + private _layoutProvider: ILayoutProvider; + private _canUseTranslate3d: boolean; + private _contentLeft: number; + private _glyphMarginLeft: number; + private _glyphMarginWidth: number; + private _glyphMarginBackgroundDomNode: FastDomNode; + + constructor(context: ViewContext, layoutProvider: ILayoutProvider) { + super(context); + this._layoutProvider = layoutProvider; + this._canUseTranslate3d = this._context.configuration.editor.viewInfo.canUseTranslate3d; + this._contentLeft = this._context.configuration.editor.layoutInfo.contentLeft; + this._glyphMarginLeft = this._context.configuration.editor.layoutInfo.glyphMarginLeft; + this._glyphMarginWidth = this._context.configuration.editor.layoutInfo.glyphMarginWidth; + + this.domNode = this._createDomNode(); + } + + public dispose(): void { + super.dispose(); + } + + public _createDomNode(): HTMLElement { + let domNode = document.createElement('div'); + domNode.className = ClassNames.MARGIN + ' monaco-editor-background'; + domNode.style.position = 'absolute'; + domNode.setAttribute('role', 'presentation'); + domNode.setAttribute('aria-hidden', 'true'); + + this._glyphMarginBackgroundDomNode = createFastDomNode(document.createElement('div')); + this._glyphMarginBackgroundDomNode.setClassName(ClassNames.GLYPH_MARGIN); + + domNode.appendChild(this._glyphMarginBackgroundDomNode.domNode); + return domNode; + } + + // --- begin event handlers + + public onConfigurationChanged(e: editorCommon.IConfigurationChangedEvent): boolean { + if (e.viewInfo.canUseTranslate3d) { + this._canUseTranslate3d = this._context.configuration.editor.viewInfo.canUseTranslate3d; + } + + return super.onConfigurationChanged(e); + } + + public onScrollChanged(e: editorCommon.IScrollEvent): boolean { + return super.onScrollChanged(e) || e.scrollTopChanged; + } + + public onLayoutChanged(layoutInfo: editorCommon.EditorLayoutInfo): boolean { + this._contentLeft = layoutInfo.contentLeft; + this._glyphMarginLeft = layoutInfo.glyphMarginLeft; + this._glyphMarginWidth = layoutInfo.glyphMarginWidth; + + return super.onLayoutChanged(layoutInfo) || true; + } + + // --- end event handlers + + public prepareRender(ctx: IRenderingContext): void { + // Nothing to read + } + + public render(ctx: IRestrictedRenderingContext): void { + if (this._canUseTranslate3d) { + let transform = 'translate3d(0px, ' + ctx.linesViewportData.visibleRangesDeltaTop + 'px, 0px)'; + StyleMutator.setTransform(this.domNode, transform); + StyleMutator.setTop(this.domNode, 0); + } else { + StyleMutator.setTransform(this.domNode, ''); + StyleMutator.setTop(this.domNode, ctx.linesViewportData.visibleRangesDeltaTop); + } + + let height = Math.min(this._layoutProvider.getTotalHeight(), 1000000); + StyleMutator.setHeight(this.domNode, height); + StyleMutator.setWidth(this.domNode, this._contentLeft); + + this._glyphMarginBackgroundDomNode.setLeft(this._glyphMarginLeft); + this._glyphMarginBackgroundDomNode.setWidth(this._glyphMarginWidth); + this._glyphMarginBackgroundDomNode.setHeight(height); + } +} diff --git a/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.css b/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.css new file mode 100644 index 00000000000..7bd8f89ab0e --- /dev/null +++ b/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.css @@ -0,0 +1,15 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +/* + Keeping name short for faster parsing. + cmdr = core margin decorations rendering (div) +*/ +.monaco-editor .margin-view-overlays .cmdr { + position: absolute; + left: 0; + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts b/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts new file mode 100644 index 00000000000..6ea01669a60 --- /dev/null +++ b/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts @@ -0,0 +1,109 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import 'vs/css!./marginDecorations'; +import * as editorCommon from 'vs/editor/common/editorCommon'; +import { DecorationToRender, DedupOverlay } from 'vs/editor/browser/viewParts/glyphMargin/glyphMargin'; +import { ViewContext } from 'vs/editor/common/view/viewContext'; +import { IRenderingContext } from 'vs/editor/common/view/renderingContext'; + +export class MarginViewLineDecorationsOverlay extends DedupOverlay { + private _context: ViewContext; + private _renderResult: string[]; + + constructor(context: ViewContext) { + super(); + this._context = context; + this._renderResult = null; + this._context.addEventHandler(this); + } + + public dispose(): void { + this._context.removeEventHandler(this); + this._context = null; + this._renderResult = null; + } + + // --- begin event handlers + + public onModelFlushed(): boolean { + return true; + } + public onModelDecorationsChanged(e: editorCommon.IViewDecorationsChangedEvent): boolean { + return true; + } + public onModelLinesDeleted(e: editorCommon.IViewLinesDeletedEvent): boolean { + return true; + } + public onModelLineChanged(e: editorCommon.IViewLineChangedEvent): boolean { + return true; + } + public onModelLinesInserted(e: editorCommon.IViewLinesInsertedEvent): boolean { + return true; + } + public onCursorPositionChanged(e: editorCommon.IViewCursorPositionChangedEvent): boolean { + return false; + } + public onCursorSelectionChanged(e: editorCommon.IViewCursorSelectionChangedEvent): boolean { + return false; + } + public onCursorRevealRange(e: editorCommon.IViewRevealRangeEvent): boolean { + return false; + } + public onConfigurationChanged(e: editorCommon.IConfigurationChangedEvent): boolean { + return true; + } + public onLayoutChanged(layoutInfo: editorCommon.EditorLayoutInfo): boolean { + return true; + } + public onScrollChanged(e: editorCommon.IScrollEvent): boolean { + return e.scrollTopChanged; + } + public onZonesChanged(): boolean { + return true; + } + + // --- end event handlers + + protected _getDecorations(ctx: IRenderingContext): DecorationToRender[] { + let decorations = ctx.getDecorationsInViewport(); + let r: DecorationToRender[] = []; + for (let i = 0, len = decorations.length; i < len; i++) { + let d = decorations[i]; + if (d.options.marginClassName) { + r.push(new DecorationToRender(d.range.startLineNumber, d.range.endLineNumber, d.options.marginClassName)); + } + } + return r; + } + + public prepareRender(ctx: IRenderingContext): void { + let visibleStartLineNumber = ctx.visibleRange.startLineNumber; + let visibleEndLineNumber = ctx.visibleRange.endLineNumber; + let toRender = this._render(visibleStartLineNumber, visibleEndLineNumber, this._getDecorations(ctx)); + + let output: string[] = []; + for (let lineNumber = visibleStartLineNumber; lineNumber <= visibleEndLineNumber; lineNumber++) { + let lineIndex = lineNumber - visibleStartLineNumber; + let classNames = toRender[lineIndex]; + let lineOutput = ''; + for (let i = 0, len = classNames.length; i < len; i++) { + lineOutput += '
'; + } + output[lineIndex] = lineOutput; + } + + this._renderResult = output; + } + + public render(startLineNumber: number, lineNumber: number): string { + if (!this._renderResult) { + return ''; + } + return this._renderResult[lineNumber - startLineNumber]; + } +} \ No newline at end of file diff --git a/src/vs/editor/browser/viewParts/viewZones/viewZones.ts b/src/vs/editor/browser/viewParts/viewZones/viewZones.ts index 45deb9e67f7..1fb668ff891 100644 --- a/src/vs/editor/browser/viewParts/viewZones/viewZones.ts +++ b/src/vs/editor/browser/viewParts/viewZones/viewZones.ts @@ -34,19 +34,31 @@ export class ViewZones extends ViewPart { private _zones: { [id: string]: IMyViewZone; }; private _lineHeight: number; private _contentWidth: number; + private _contentLeft: number; public domNode: HTMLElement; + public marginDomNode: HTMLElement; + constructor(context: ViewContext, whitespaceManager: IWhitespaceManager) { super(context); this._lineHeight = this._context.configuration.editor.lineHeight; this._contentWidth = this._context.configuration.editor.layoutInfo.contentWidth; + this._contentLeft = this._context.configuration.editor.layoutInfo.contentLeft; this._whitespaceManager = whitespaceManager; + this.domNode = document.createElement('div'); this.domNode.className = ClassNames.VIEW_ZONES; this.domNode.style.position = 'absolute'; this.domNode.setAttribute('role', 'presentation'); this.domNode.setAttribute('aria-hidden', 'true'); + + this.marginDomNode = document.createElement('div'); + this.marginDomNode.className = 'margin-view-zones'; + this.marginDomNode.style.position = 'absolute'; + this.marginDomNode.setAttribute('role', 'presentation'); + this.marginDomNode.setAttribute('aria-hidden', 'true'); + this._zones = {}; } @@ -84,6 +96,7 @@ export class ViewZones extends ViewPart { if (e.layoutInfo) { this._contentWidth = this._context.configuration.editor.layoutInfo.contentWidth; + this._contentLeft = this._context.configuration.editor.layoutInfo.contentLeft; } return false; @@ -187,11 +200,19 @@ export class ViewZones extends ViewPart { myZone.delegate.domNode.style.position = 'absolute'; myZone.delegate.domNode.style.width = '100%'; StyleMutator.setDisplay(myZone.delegate.domNode, 'none'); + myZone.delegate.domNode.setAttribute('monaco-view-zone', myZone.whitespaceId.toString()); + this.domNode.appendChild(myZone.delegate.domNode); + + if (myZone.delegate.marginDomNode) { + myZone.delegate.marginDomNode.style.position = 'absolute'; + myZone.delegate.marginDomNode.style.width = '100%'; + StyleMutator.setDisplay(myZone.delegate.marginDomNode, 'none'); + myZone.delegate.marginDomNode.setAttribute('monaco-view-zone', myZone.whitespaceId.toString()); + this.marginDomNode.appendChild(myZone.delegate.marginDomNode); + } this._zones[myZone.whitespaceId.toString()] = myZone; - myZone.delegate.domNode.setAttribute('monaco-view-zone', myZone.whitespaceId.toString()); - this.domNode.appendChild(myZone.delegate.domNode); this.setShouldRender(); @@ -208,6 +229,12 @@ export class ViewZones extends ViewPart { zone.delegate.domNode.removeAttribute('monaco-view-zone'); zone.delegate.domNode.parentNode.removeChild(zone.delegate.domNode); + if (zone.delegate.marginDomNode) { + zone.delegate.marginDomNode.removeAttribute('monaco-visible-view-zone'); + zone.delegate.marginDomNode.removeAttribute('monaco-view-zone'); + zone.delegate.marginDomNode.parentNode.removeChild(zone.delegate.marginDomNode); + } + this.setShouldRender(); return true; @@ -292,28 +319,40 @@ export class ViewZones extends ViewPart { let id = keys[i]; let zone = this._zones[id]; + let newTop = 0; + let newHeight = 0; + let newDisplay = 'none'; if (visibleZones.hasOwnProperty(id)) { + newTop = visibleZones[id].verticalOffset - ctx.bigNumbersDelta; + newHeight = visibleZones[id].height; + newDisplay = 'block'; // zone is visible - StyleMutator.setTop(zone.delegate.domNode, (visibleZones[id].verticalOffset - ctx.bigNumbersDelta)); - StyleMutator.setHeight(zone.delegate.domNode, visibleZones[id].height); if (!zone.isVisible) { - StyleMutator.setDisplay(zone.delegate.domNode, 'block'); zone.delegate.domNode.setAttribute('monaco-visible-view-zone', 'true'); zone.isVisible = true; } this._safeCallOnDomNodeTop(zone.delegate, ctx.getScrolledTopFromAbsoluteTop(visibleZones[id].verticalOffset)); } else { if (zone.isVisible) { - StyleMutator.setDisplay(zone.delegate.domNode, 'none'); zone.delegate.domNode.removeAttribute('monaco-visible-view-zone'); zone.isVisible = false; } this._safeCallOnDomNodeTop(zone.delegate, ctx.getScrolledTopFromAbsoluteTop(-1000000)); } + StyleMutator.setTop(zone.delegate.domNode, newTop); + StyleMutator.setHeight(zone.delegate.domNode, newHeight); + StyleMutator.setDisplay(zone.delegate.domNode, newDisplay); + + if (zone.delegate.marginDomNode) { + StyleMutator.setTop(zone.delegate.marginDomNode, newTop); + StyleMutator.setHeight(zone.delegate.marginDomNode, newHeight); + StyleMutator.setDisplay(zone.delegate.marginDomNode, newDisplay); + } } if (hasVisibleZone) { StyleMutator.setWidth(this.domNode, Math.max(ctx.scrollWidth, this._contentWidth)); + StyleMutator.setWidth(this.marginDomNode, this._contentLeft); } } } diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts index 46630684f54..d81a1b1fbf9 100644 --- a/src/vs/editor/browser/widget/diffEditorWidget.ts +++ b/src/vs/editor/browser/widget/diffEditorWidget.ts @@ -849,6 +849,7 @@ export class DiffEditorWidget extends EventEmitter implements editorBrowser.IDif clonedOptions.folding = false; clonedOptions.codeLens = false; clonedOptions.fixedOverflowWidgets = true; + clonedOptions.lineDecorationsWidth = '2ch'; return clonedOptions; } @@ -1492,8 +1493,15 @@ class DiffEdtorWidgetSideBySide extends DiffEditorWidgetStyle implements IDiffEd let lineChange = lineChanges[i]; if (isChangeOrDelete(lineChange)) { - - result.decorations.push(createDecoration(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Number.MAX_VALUE, 'line-delete', true)); + result.decorations.push({ + range: new Range(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Number.MAX_VALUE), + options: { + className: 'line-delete', + linesDecorationsClassName: 'delete-sign', + marginClassName: 'line-delete', + isWholeLine: true + } + }); if (!isChangeOrInsert(lineChange) || !lineChange.charChanges) { result.decorations.push(createDecoration(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Number.MAX_VALUE, 'char-delete', true)); } @@ -1553,7 +1561,15 @@ class DiffEdtorWidgetSideBySide extends DiffEditorWidgetStyle implements IDiffEd if (isChangeOrInsert(lineChange)) { - result.decorations.push(createDecoration(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Number.MAX_VALUE, 'line-insert', true)); + result.decorations.push({ + range: new Range(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Number.MAX_VALUE), + options: { + className: 'line-insert', + linesDecorationsClassName: 'insert-sign', + marginClassName: 'line-insert', + isWholeLine: true + } + }); if (!isChangeOrDelete(lineChange) || !lineChange.charChanges) { result.decorations.push(createDecoration(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Number.MAX_VALUE, 'char-insert', true)); } @@ -1671,6 +1687,13 @@ class DiffEdtorWidgetInline extends DiffEditorWidgetStyle implements IDiffEditor // Add overview zones in the overview ruler if (isChangeOrDelete(lineChange)) { + result.decorations.push({ + range: new Range(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Number.MAX_VALUE), + options: { + marginClassName: 'line-delete', + } + }); + result.overviewZones.push(new editorCommon.OverviewRulerZone( lineChange.originalStartLineNumber, lineChange.originalEndLineNumber, @@ -1699,7 +1722,15 @@ class DiffEdtorWidgetInline extends DiffEditorWidgetStyle implements IDiffEditor // Add decorations & overview zones if (isChangeOrInsert(lineChange)) { - result.decorations.push(createDecoration(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Number.MAX_VALUE, 'line-insert', true)); + result.decorations.push({ + range: new Range(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Number.MAX_VALUE), + options: { + className: 'line-insert', + linesDecorationsClassName: 'insert-sign', + marginClassName: 'line-insert', + isWholeLine: true + } + }); result.overviewZones.push(new editorCommon.OverviewRulerZone( lineChange.modifiedStartLineNumber, @@ -1765,16 +1796,20 @@ class InlineViewZonesComputer extends ViewZonesComputer { } _produceOriginalFromDiff(lineChange: editorCommon.ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone { + let marginDomNode = document.createElement('div'); + marginDomNode.className = 'inline-added-margin-view-zone'; + Configuration.applyFontInfoSlow(marginDomNode, this.modifiedEditorConfiguration.fontInfo); + return { afterLineNumber: Math.max(lineChange.originalStartLineNumber, lineChange.originalEndLineNumber), heightInLines: lineChangeModifiedLength, - domNode: document.createElement('div') + domNode: document.createElement('div'), + marginDomNode: marginDomNode }; } _produceModifiedFromDiff(lineChange: editorCommon.ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone { let decorations: InlineDecoration[] = []; - if (lineChange.charChanges) { for (let j = 0, lengthJ = lineChange.charChanges.length; j < lengthJ; j++) { let charChange = lineChange.charChanges[j]; @@ -1788,8 +1823,16 @@ class InlineViewZonesComputer extends ViewZonesComputer { } let html: string[] = []; + let marginHTML: string[] = []; + let lineDecorationsWidth = this.modifiedEditorConfiguration.layoutInfo.decorationsWidth; + let lineHeight = this.modifiedEditorConfiguration.lineHeight; for (let lineNumber = lineChange.originalStartLineNumber; lineNumber <= lineChange.originalEndLineNumber; lineNumber++) { html = html.concat(this.renderOriginalLine(lineNumber - lineChange.originalStartLineNumber, this.originalModel, this.modifiedEditorConfiguration, this.modifiedEditorTabSize, lineNumber, decorations)); + + let index = lineNumber - lineChange.originalStartLineNumber; + marginHTML = marginHTML.concat([ + `
` + ]); } let domNode = document.createElement('div'); @@ -1797,11 +1840,17 @@ class InlineViewZonesComputer extends ViewZonesComputer { domNode.innerHTML = html.join(''); Configuration.applyFontInfoSlow(domNode, this.modifiedEditorConfiguration.fontInfo); + let marginDomNode = document.createElement('div'); + marginDomNode.className = 'inline-deleted-margin-view-zone'; + marginDomNode.innerHTML = marginHTML.join(''); + Configuration.applyFontInfoSlow(marginDomNode, this.modifiedEditorConfiguration.fontInfo); + return { shouldNotShrink: true, afterLineNumber: (lineChange.modifiedEndLineNumber === 0 ? lineChange.modifiedStartLineNumber : lineChange.modifiedStartLineNumber - 1), heightInLines: lineChangeOriginalLength, - domNode: domNode + domNode: domNode, + marginDomNode: marginDomNode }; } diff --git a/src/vs/editor/browser/widget/media/addition-inverse.svg b/src/vs/editor/browser/widget/media/addition-inverse.svg new file mode 100644 index 00000000000..3475c1e1963 --- /dev/null +++ b/src/vs/editor/browser/widget/media/addition-inverse.svg @@ -0,0 +1 @@ +Layer 1 \ No newline at end of file diff --git a/src/vs/editor/browser/widget/media/addition.svg b/src/vs/editor/browser/widget/media/addition.svg new file mode 100644 index 00000000000..bdecdb0e45b --- /dev/null +++ b/src/vs/editor/browser/widget/media/addition.svg @@ -0,0 +1 @@ +Layer 1 \ No newline at end of file diff --git a/src/vs/editor/browser/widget/media/deletion-inverse.svg b/src/vs/editor/browser/widget/media/deletion-inverse.svg new file mode 100644 index 00000000000..2de46fcf5b5 --- /dev/null +++ b/src/vs/editor/browser/widget/media/deletion-inverse.svg @@ -0,0 +1 @@ +Layer 1 \ No newline at end of file diff --git a/src/vs/editor/browser/widget/media/deletion.svg b/src/vs/editor/browser/widget/media/deletion.svg new file mode 100644 index 00000000000..f5d128b2df8 --- /dev/null +++ b/src/vs/editor/browser/widget/media/deletion.svg @@ -0,0 +1 @@ +Layer 1 \ No newline at end of file diff --git a/src/vs/editor/browser/widget/media/diffEditor.css b/src/vs/editor/browser/widget/media/diffEditor.css index 50108a207d2..ba9f82fff05 100644 --- a/src/vs/editor/browser/widget/media/diffEditor.css +++ b/src/vs/editor/browser/widget/media/diffEditor.css @@ -49,6 +49,28 @@ .monaco-editor .char-insert { background: rgba(155, 185, 85, 0.2); } + +.monaco-editor .insert-sign, .monaco-editor .delete-sign { + background-size: 60%; + background-repeat: no-repeat; + background-position: 50% 50%; +} +.monaco-editor .insert-sign { background-image: url('addition.svg'); } +.monaco-editor .delete-sign { background-image: url('deletion.svg'); } + +.monaco-editor.vs-dark .insert-sign, .monaco-editor.hc-black .insert-sign { background-image: url('addition-inverse.svg'); } +.monaco-editor.vs-dark .delete-sign, .monaco-editor.hc-black .delete-sign { background-image: url('deletion-inverse.svg'); } + +.monaco-editor .inline-deleted-margin-view-zone { + background: rgba(255, 0, 0, 0.2); + text-align: right; +} +.monaco-editor .inline-added-margin-view-zone { + background: rgba(155, 185, 85, 0.2); + text-align: right; +} + + .monaco-editor.hc-black .line-insert, .monaco-editor.hc-black .char-insert { background: none; diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts index f7806f161f7..18215d128da 100644 --- a/src/vs/editor/common/config/commonEditorConfig.ts +++ b/src/vs/editor/common/config/commonEditorConfig.ts @@ -166,7 +166,14 @@ class InternalEditorOptionsHelper { let glyphMargin = toBoolean(opts.glyphMargin); let lineNumbers = opts.lineNumbers; let lineNumbersMinChars = toInteger(opts.lineNumbersMinChars, 1); - let lineDecorationsWidth = toInteger(opts.lineDecorationsWidth, 0); + + let lineDecorationsWidth: number; + if (typeof opts.lineDecorationsWidth === 'string' && /^\d+(\.\d+)?ch$/.test(opts.lineDecorationsWidth)) { + let multiple = parseFloat(opts.lineDecorationsWidth.substr(0, opts.lineDecorationsWidth.length - 2)); + lineDecorationsWidth = multiple * fontInfo.typicalHalfwidthCharacterWidth; + } else { + lineDecorationsWidth = toInteger(opts.lineDecorationsWidth, 0); + } if (opts.folding) { lineDecorationsWidth += 16; } @@ -270,6 +277,14 @@ class InternalEditorOptionsHelper { renderWhitespace = 'none'; } + let renderLineHighlight = opts.renderLineHighlight; + // Compatibility with old true or false values + if (renderLineHighlight === true) { + renderLineHighlight = 'line'; + } else if (renderLineHighlight === false) { + renderLineHighlight = 'none'; + } + let viewInfo = new editorCommon.InternalEditorViewOptions({ theme: opts.theme, canUseTranslate3d: canUseTranslate3d, @@ -294,7 +309,7 @@ class InternalEditorOptionsHelper { renderWhitespace: renderWhitespace, renderControlCharacters: toBoolean(opts.renderControlCharacters), renderIndentGuides: toBoolean(opts.renderIndentGuides), - renderLineHighlight: toBoolean(opts.renderLineHighlight), + renderLineHighlight: renderLineHighlight, scrollbar: scrollbar, fixedOverflowWidgets: toBoolean(opts.fixedOverflowWidgets) }); @@ -845,9 +860,10 @@ let editorConfiguration: IConfigurationNode = { description: nls.localize('renderIndentGuides', "Controls whether the editor should render indent guides") }, 'editor.renderLineHighlight': { - 'type': 'boolean', + 'type': 'string', + 'enum': ['none', 'gutter', 'line', 'all'], default: DefaultConfig.editor.renderLineHighlight, - description: nls.localize('renderLineHighlight', "Controls whether the editor should render the current line highlight") + description: nls.localize('renderLineHighlight', "Controls how the editor should render the current line highlight, posibilties are 'none', 'gutter', 'line', and 'all'.") }, 'editor.codeLens': { 'type': 'boolean', diff --git a/src/vs/editor/common/config/defaultConfig.ts b/src/vs/editor/common/config/defaultConfig.ts index d608fddde27..8368391ae4d 100644 --- a/src/vs/editor/common/config/defaultConfig.ts +++ b/src/vs/editor/common/config/defaultConfig.ts @@ -98,7 +98,7 @@ class ConfigClass implements IConfiguration { renderWhitespace: 'none', renderControlCharacters: false, renderIndentGuides: false, - renderLineHighlight: true, + renderLineHighlight: 'all', useTabStops: true, fontFamily: ( diff --git a/src/vs/editor/common/controller/cursor.ts b/src/vs/editor/common/controller/cursor.ts index c7424ed3cde..aaec879f9cc 100644 --- a/src/vs/editor/common/controller/cursor.ts +++ b/src/vs/editor/common/controller/cursor.ts @@ -248,8 +248,13 @@ export class Cursor extends EventEmitter { this.emitCursorSelectionChanged('model', editorCommon.CursorChangeReason.ContentFlush); } else { if (!this._isHandling) { + // Read the markers before entering `_onHandler`, since that would validate + // the position and ruin the markers + let selections: Selection[] = this.cursors.getAll().map((cursor) => { + return cursor.beginRecoverSelectionFromMarkers(); + }); this._onHandler('recoverSelectionFromMarkers', (ctx: IMultipleCursorOperationContext) => { - var result = this._invokeForAll(ctx, (cursorIndex: number, oneCursor: OneCursor, oneCtx: IOneCursorOperationContext) => oneCursor.recoverSelectionFromMarkers(oneCtx)); + var result = this._invokeForAll(ctx, (cursorIndex: number, oneCursor: OneCursor, oneCtx: IOneCursorOperationContext) => oneCursor.endRecoverSelectionFromMarkers(oneCtx, selections[cursorIndex])); ctx.shouldPushStackElementBefore = false; ctx.shouldPushStackElementAfter = false; return result; diff --git a/src/vs/editor/common/controller/oneCursor.ts b/src/vs/editor/common/controller/oneCursor.ts index e0ee4e876fb..4ee147dcf3f 100644 --- a/src/vs/editor/common/controller/oneCursor.ts +++ b/src/vs/editor/common/controller/oneCursor.ts @@ -378,7 +378,7 @@ export class OneCursor implements IOneCursor { this._setState(modelState, viewState, ensureInEditableRange); } - private _recoverSelectionFromMarkers(): Selection { + public beginRecoverSelectionFromMarkers(): Selection { let start = this.model._getMarker(this._selStartMarker); let end = this.model._getMarker(this._selEndMarker); @@ -389,15 +389,13 @@ export class OneCursor implements IOneCursor { return new Selection(end.lineNumber, end.column, start.lineNumber, start.column); } - public recoverSelectionFromMarkers(ctx: IOneCursorOperationContext): boolean { + public endRecoverSelectionFromMarkers(ctx: IOneCursorOperationContext, recoveredSelection: Selection): boolean { ctx.cursorPositionChangeReason = editorCommon.CursorChangeReason.RecoverFromMarkers; ctx.shouldPushStackElementBefore = true; ctx.shouldPushStackElementAfter = true; ctx.shouldReveal = false; ctx.shouldRevealHorizontal = false; - let recoveredSelection = this._recoverSelectionFromMarkers(); - let selectionStart = new Range(recoveredSelection.selectionStartLineNumber, recoveredSelection.selectionStartColumn, recoveredSelection.selectionStartLineNumber, recoveredSelection.selectionStartColumn); let position = new Position(recoveredSelection.positionLineNumber, recoveredSelection.positionColumn); diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts index 1b041b73321..027fc00651b 100644 --- a/src/vs/editor/common/editorCommon.ts +++ b/src/vs/editor/common/editorCommon.ts @@ -226,9 +226,10 @@ export interface IEditorOptions { /** * The width reserved for line decorations (in px). * Line decorations are placed between line numbers and the editor content. + * You can pass in a string in the format floating point followed by "ch". e.g. 1.3ch. * Defaults to 10. */ - lineDecorationsWidth?: number; + lineDecorationsWidth?: number | string; /** * When revealing the cursor, a virtual padding (px) is added to the cursor, turning it into a rectangle. * This virtual padding ensures that the cursor gets revealed before hitting the edge of the viewport. @@ -465,9 +466,9 @@ export interface IEditorOptions { renderIndentGuides?: boolean; /** * Enable rendering of current line highlight. - * Defaults to true. + * Defaults to all. */ - renderLineHighlight?: boolean; + renderLineHighlight?: 'none' | 'gutter' | 'line' | 'all'; /** * Inserting and deleting whitespace follows tab stops. */ @@ -668,7 +669,7 @@ export class InternalEditorViewOptions { readonly renderWhitespace: 'none' | 'boundary' | 'all'; readonly renderControlCharacters: boolean; readonly renderIndentGuides: boolean; - readonly renderLineHighlight: boolean; + readonly renderLineHighlight: 'none' | 'gutter' | 'line' | 'all'; readonly scrollbar: InternalEditorScrollbarOptions; readonly fixedOverflowWidgets: boolean; @@ -699,7 +700,7 @@ export class InternalEditorViewOptions { renderWhitespace: 'none' | 'boundary' | 'all'; renderControlCharacters: boolean; renderIndentGuides: boolean; - renderLineHighlight: boolean; + renderLineHighlight: 'none' | 'gutter' | 'line' | 'all'; scrollbar: InternalEditorScrollbarOptions; fixedOverflowWidgets: boolean; }) { @@ -726,7 +727,7 @@ export class InternalEditorViewOptions { this.renderWhitespace = source.renderWhitespace; this.renderControlCharacters = Boolean(source.renderControlCharacters); this.renderIndentGuides = Boolean(source.renderIndentGuides); - this.renderLineHighlight = Boolean(source.renderLineHighlight); + this.renderLineHighlight = source.renderLineHighlight; this.scrollbar = source.scrollbar.clone(); this.fixedOverflowWidgets = Boolean(source.fixedOverflowWidgets); } @@ -1150,6 +1151,10 @@ export interface IModelDecorationOptions { * If set, the decoration will be rendered in the lines decorations with this CSS class name. */ linesDecorationsClassName?: string; + /** + * If set, the decoration will be rendered in the margin (covering its full width) with this CSS class name. + */ + marginClassName?: string; /** * If set, the decoration will be rendered inline with the text with this CSS class name. * Please use this only for CSS rules that must impact the text. For example, use `className` diff --git a/src/vs/editor/common/model/textModelWithDecorations.ts b/src/vs/editor/common/model/textModelWithDecorations.ts index fc5515fa54d..f42af47cf09 100644 --- a/src/vs/editor/common/model/textModelWithDecorations.ts +++ b/src/vs/editor/common/model/textModelWithDecorations.ts @@ -654,6 +654,7 @@ class ModelDecorationOptions implements editorCommon.IModelDecorationOptions { overviewRuler: editorCommon.IModelDecorationOverviewRulerOptions; glyphMarginClassName: string; linesDecorationsClassName: string; + marginClassName: string; inlineClassName: string; beforeContentClassName: string; afterContentClassName: string; @@ -667,6 +668,7 @@ class ModelDecorationOptions implements editorCommon.IModelDecorationOptions { this.overviewRuler = _normalizeOverviewRulerOptions(options.overviewRuler, options.showInOverviewRuler); this.glyphMarginClassName = cleanClassName(options.glyphMarginClassName || strings.empty); this.linesDecorationsClassName = cleanClassName(options.linesDecorationsClassName || strings.empty); + this.marginClassName = cleanClassName(options.marginClassName || strings.empty); this.inlineClassName = cleanClassName(options.inlineClassName || strings.empty); this.beforeContentClassName = cleanClassName(options.beforeContentClassName || strings.empty); this.afterContentClassName = cleanClassName(options.afterContentClassName || strings.empty); @@ -689,6 +691,7 @@ class ModelDecorationOptions implements editorCommon.IModelDecorationOptions { && this.showInOverviewRuler === other.showInOverviewRuler && this.glyphMarginClassName === other.glyphMarginClassName && this.linesDecorationsClassName === other.linesDecorationsClassName + && this.marginClassName === other.marginClassName && this.inlineClassName === other.inlineClassName && this.beforeContentClassName === other.beforeContentClassName && this.afterContentClassName === other.afterContentClassName diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index 419759fbf32..f3c6d995363 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -191,7 +191,6 @@ export interface ISuggestion { additionalTextEdits?: editorCommon.ISingleEditOperation[]; command?: Command; snippetType?: SnippetType; - _extensionId?: string; } /** diff --git a/src/vs/editor/contrib/format/common/formatActions.ts b/src/vs/editor/contrib/format/common/formatActions.ts index 95ba075e171..7914249c626 100644 --- a/src/vs/editor/contrib/format/common/formatActions.ts +++ b/src/vs/editor/contrib/format/common/formatActions.ts @@ -232,13 +232,19 @@ export class FormatSelectionAction extends AbstractFormatAction { CommandsRegistry.registerCommand('editor.action.format', accessor => { const editor = accessor.get(ICodeEditorService).getFocusedCodeEditor(); if (editor) { - const model = editor.getModel(); - const editorSelection = editor.getSelection(); - const {tabSize, insertSpaces } = model.getOptions(); - if (editorSelection.isEmpty()) { - return getDocumentFormattingEdits(model, { tabSize, insertSpaces }); - } else { - return getDocumentRangeFormattingEdits(model, editorSelection, { tabSize, insertSpaces }); - } + return new class extends AbstractFormatAction { + constructor() { + super({}); + } + _getFormattingEdits(editor: editorCommon.ICommonCodeEditor): TPromise { + const model = editor.getModel(); + const editorSelection = editor.getSelection(); + const {tabSize, insertSpaces } = model.getOptions(); + + return editorSelection.isEmpty() + ? getDocumentFormattingEdits(model, { tabSize, insertSpaces }) + : getDocumentRangeFormattingEdits(model, editorSelection, { tabSize, insertSpaces }); + } + }().run(accessor, editor); } }); diff --git a/src/vs/editor/contrib/suggest/browser/suggestController.ts b/src/vs/editor/contrib/suggest/browser/suggestController.ts index 9b36f080e7d..770663c78ea 100644 --- a/src/vs/editor/contrib/suggest/browser/suggestController.ts +++ b/src/vs/editor/contrib/suggest/browser/suggestController.ts @@ -111,17 +111,6 @@ export class SuggestController implements IEditorContribution { this.telemetryService.publicLog('suggestSnippetInsert', { hasPlaceholders: snippet.placeHolders.length > 0 }); - - // telemetry experiment to figure out which extensions use - // the internal snippet syntax today and which use the tm - // snippet syntax (by accident?) - if (suggestion._extensionId) { - this.telemetryService.publicLog('suggestSnippetInsert2', { - extension: suggestion._extensionId, - internalPlaceholders: snippet.placeHolders.length, - tmPlaceholders: CodeSnippet.fromTextmate(suggestion.insertText).placeHolders.length - }); - } } } diff --git a/src/vs/editor/test/common/commands/sideEditing.test.ts b/src/vs/editor/test/common/commands/sideEditing.test.ts index 11bffa264dc..3910afd16ad 100644 --- a/src/vs/editor/test/common/commands/sideEditing.test.ts +++ b/src/vs/editor/test/common/commands/sideEditing.test.ts @@ -169,4 +169,37 @@ suite('Editor Side Editing - collapsed selection', () => { ); }); + test('issue #15267: Suggestion that adds a line - cursor goes to the wrong line ', () => { + testCommand( + [ + 'package main', + '', + 'import (', + ' "fmt"', + ')', + '', + 'func main(', + ' fmt.Println(strings.Con)', + '}' + ], + new Selection(8, 25, 8, 25), + [ + EditOperation.replaceMove(new Range(5, 1, 5, 1), '\t\"strings\"\n') + ], + [ + 'package main', + '', + 'import (', + ' "fmt"', + ' "strings"', + ')', + '', + 'func main(', + ' fmt.Println(strings.Con)', + '}' + ], + new Selection(9, 25, 9, 25) + ); + }); + }); \ No newline at end of file diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 2e5f97c1a6a..69a12985a59 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -1088,9 +1088,10 @@ declare module monaco.editor { /** * The width reserved for line decorations (in px). * Line decorations are placed between line numbers and the editor content. + * You can pass in a string in the format floating point followed by "ch". e.g. 1.3ch. * Defaults to 10. */ - lineDecorationsWidth?: number; + lineDecorationsWidth?: number | string; /** * When revealing the cursor, a virtual padding (px) is added to the cursor, turning it into a rectangle. * This virtual padding ensures that the cursor gets revealed before hitting the edge of the viewport. @@ -1321,9 +1322,9 @@ declare module monaco.editor { renderIndentGuides?: boolean; /** * Enable rendering of current line highlight. - * Defaults to true. + * Defaults to all. */ - renderLineHighlight?: boolean; + renderLineHighlight?: 'none' | 'gutter' | 'line' | 'all'; /** * Inserting and deleting whitespace follows tab stops. */ @@ -1423,7 +1424,7 @@ declare module monaco.editor { readonly renderWhitespace: 'none' | 'boundary' | 'all'; readonly renderControlCharacters: boolean; readonly renderIndentGuides: boolean; - readonly renderLineHighlight: boolean; + readonly renderLineHighlight: 'none' | 'gutter' | 'line' | 'all'; readonly scrollbar: InternalEditorScrollbarOptions; readonly fixedOverflowWidgets: boolean; } @@ -1581,6 +1582,10 @@ declare module monaco.editor { * If set, the decoration will be rendered in the lines decorations with this CSS class name. */ linesDecorationsClassName?: string; + /** + * If set, the decoration will be rendered in the margin (covering its full width) with this CSS class name. + */ + marginClassName?: string; /** * If set, the decoration will be rendered inline with the text with this CSS class name. * Please use this only for CSS rules that must impact the text. For example, use `className` @@ -3512,6 +3517,10 @@ declare module monaco.editor { * The dom node of the view zone */ domNode: HTMLElement; + /** + * An optional dom node for the view zone that will be placed in the margin area. + */ + marginDomNode?: HTMLElement; /** * Callback which gives the relative top of the view zone as it appears (taking scrolling into account). */ diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts index 4ae50dd5f3c..b6f363a3f67 100644 --- a/src/vs/platform/actions/common/actions.ts +++ b/src/vs/platform/actions/common/actions.ts @@ -111,25 +111,16 @@ export class MenuItemAction extends Action { return result; } - private _resource: URI; - constructor( private _item: IMenuItem, - @ICommandService private _commandService: ICommandService + @ICommandService private _commandService: ICommandService, + @IContextKeyService private _contextKeyService: IContextKeyService ) { super(MenuItemAction._getMenuItemId(_item), _item.command.title); this.order = this._item.order; //TODO@Ben order is menu item property, not an action property } - set resource(value: URI) { - this._resource = value; - } - - get resource() { - return this._resource; - } - get item(): IMenuItem { return this._item; } @@ -144,7 +135,8 @@ export class MenuItemAction extends Action { run(alt: boolean) { const {id} = alt === true && this._item.alt || this._item.command; - return this._commandService.executeCommand(id, this._resource); + const resource = this._contextKeyService.getContextKeyValue('resource'); + return this._commandService.executeCommand(id, resource); } } @@ -339,4 +331,4 @@ export class DeferredAction extends Action { } super.dispose(); } -} \ No newline at end of file +} diff --git a/src/vs/platform/actions/common/menuService.ts b/src/vs/platform/actions/common/menuService.ts index 5ee1e93c756..74d096dc3aa 100644 --- a/src/vs/platform/actions/common/menuService.ts +++ b/src/vs/platform/actions/common/menuService.ts @@ -13,7 +13,6 @@ import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/commo import { MenuId, MenuRegistry, ICommandAction, MenuItemAction, IMenu, IMenuItem, IMenuService } from 'vs/platform/actions/common/actions'; import { IExtensionService } from 'vs/platform/extensions/common/extensions'; import { ICommandService } from 'vs/platform/commands/common/commands'; -import { ResourceContextKey } from 'vs/platform/actions/common/resourceContextKey'; export class MenuService implements IMenuService { @@ -64,7 +63,7 @@ class Menu implements IMenu { group = [groupName, []]; this._menuGroups.push(group); } - group[1].push(new MenuItemAction(item, this._commandService)); + group[1].push(new MenuItemAction(item, this._commandService, this._contextKeyService)); // keep keys for eventing Menu._fillInKbExprKeys(item.when, keysFilter); @@ -100,7 +99,6 @@ class Menu implements IMenu { const activeActions: MenuItemAction[] = []; for (let action of actions) { if (this._contextKeyService.contextMatchesRules(action.item.when)) { - action.resource = ResourceContextKey.Resource.getValue(this._contextKeyService); activeActions.push(action); } } @@ -159,4 +157,4 @@ class Menu implements IMenu { // sort on titles return a.command.title.localeCompare(b.command.title); } -} \ No newline at end of file +} diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts index 2c4b078a35f..855ba57f2de 100644 --- a/src/vs/platform/windows/common/windows.ts +++ b/src/vs/platform/windows/common/windows.ts @@ -88,7 +88,7 @@ export interface IWindowSettings { openFilesInNewWindow: boolean; reopenFolders: 'all' | 'one' | 'none'; restoreFullscreen: boolean; - fullScreenZenMode: boolean; + fullScreenFocusMode: boolean; zoomLevel: number; titleBarStyle: 'native' | 'custom'; } diff --git a/src/vs/test/utils/servicesTestUtils.ts b/src/vs/test/utils/servicesTestUtils.ts index a58904a0bcd..39c8f4024a6 100644 --- a/src/vs/test/utils/servicesTestUtils.ts +++ b/src/vs/test/utils/servicesTestUtils.ts @@ -294,7 +294,7 @@ export class TestPartService implements IPartService { } - public toggleZenMode(): void { } + public toggleFocusMode(): void { } } export class TestEventService extends EventEmitter implements IEventService { diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 5f60c994fad..ae7b4852481 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -209,14 +209,16 @@ declare module 'vscode' { /** * Get a word-range at the given position. By default words are defined by * common separators, like space, -, _, etc. In addition, per languge custom - * [word definitions](#LanguageConfiguration.wordPattern) can be defined. + * [word definitions](#LanguageConfiguration.wordPattern) can be defined. It + * is also possible to provide a custom regular expression. * * The position will be [adjusted](#TextDocument.validatePosition). * * @param position A position. + * @param regex Optional regular expression that describes what a word is. * @return A range spanning a word, or `undefined`. */ - getWordRangeAtPosition(position: Position): Range; + getWordRangeAtPosition(position: Position, regex?: RegExp): Range; /** * Ensure a range is completely contained in this document. diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index e7ee3be9ea0..be5a2dfb6b0 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -211,7 +211,7 @@ export function createApiFactory(initData: IInitData, threadService: IThreadServ return languageFeatures.registerSignatureHelpProvider(selector, provider, triggerCharacters); }, registerCompletionItemProvider(selector: vscode.DocumentSelector, provider: vscode.CompletionItemProvider, ...triggerCharacters: string[]): vscode.Disposable { - return languageFeatures.registerCompletionItemProvider(selector, provider, triggerCharacters, extension); + return languageFeatures.registerCompletionItemProvider(selector, provider, triggerCharacters); }, registerDocumentLinkProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentLinkProvider): vscode.Disposable { return languageFeatures.registerDocumentLinkProvider(selector, provider); diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index fa2eaedd45d..f3f2d98ab63 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -29,7 +29,7 @@ import * as modes from 'vs/editor/common/modes'; import { IResourceEdit } from 'vs/editor/common/services/bulkEdit'; import { ConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditing'; -import { WorkspaceConfigurationNode } from 'vs/workbench/services/configuration/common/configuration'; +import { IWorkspaceConfiguration } from 'vs/workbench/services/configuration/common/configuration'; import { IPickOpenEntry, IPickOptions } from 'vs/workbench/services/quickopen/common/quickOpenService'; import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles'; @@ -54,7 +54,7 @@ export interface IInitData { workspace: IWorkspace; }; extensions: IExtensionDescription[]; - configuration: WorkspaceConfigurationNode; + configuration: IWorkspaceConfiguration; telemetryInfo: ITelemetryInfo; } @@ -236,7 +236,7 @@ export abstract class ExtHostCommandsShape { } export abstract class ExtHostConfigurationShape { - $acceptConfigurationChanged(config: WorkspaceConfigurationNode) { throw ni(); } + $acceptConfigurationChanged(entries: IWorkspaceConfiguration) { throw ni(); } } export abstract class ExtHostDiagnosticsShape { diff --git a/src/vs/workbench/api/node/extHostConfiguration.ts b/src/vs/workbench/api/node/extHostConfiguration.ts index c7d9a594fa6..e374c3fe74c 100644 --- a/src/vs/workbench/api/node/extHostConfiguration.ts +++ b/src/vs/workbench/api/node/extHostConfiguration.ts @@ -9,48 +9,93 @@ import Event, { Emitter } from 'vs/base/common/event'; import { WorkspaceConfiguration } from 'vscode'; import { ExtHostConfigurationShape, MainThreadConfigurationShape } from './extHost.protocol'; import { ConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditing'; -import { WorkspaceConfigurationNode, IWorkspaceConfigurationValue } from 'vs/workbench/services/configuration/common/configuration'; +import { IWorkspaceConfiguration } from 'vs/workbench/services/configuration/common/configuration'; + +function lookUp(tree: any, key: string) { + if (key) { + const parts = key.split('.'); + let node = tree; + for (let i = 0; node && i < parts.length; i++) { + node = node[parts[i]]; + } + return node; + } +} + +function insert(tree: any, key: string, value: any) { + const parts = key.split('.'); + let node = tree; + let i: number; + let to = parts.length - 1; + for (i = 0; i < to; i++) { + let child = node[parts[i]]; + if (child) { + node = child; + } else { + break; + } + } + for (; i < to; i++) { + node = node[parts[i]] = Object.create(null); + } + node[parts[to]] = value; +} + +interface UsefulConfiguration { + data: IWorkspaceConfiguration; + valueTree: any; +} + +function createUsefulConfiguration(data: IWorkspaceConfiguration): { data: IWorkspaceConfiguration, valueTree: any } { + const valueTree = Object.create(null); + for (let key in data) { + if (Object.prototype.hasOwnProperty.call(data, key)) { + insert(valueTree, key, data[key].value); + } + } + return { + data, + valueTree + }; +} export class ExtHostConfiguration extends ExtHostConfigurationShape { - private _proxy: MainThreadConfigurationShape; - private _config: WorkspaceConfigurationNode; private _onDidChangeConfiguration = new Emitter(); + private _proxy: MainThreadConfigurationShape; + private _configuration: UsefulConfiguration; - constructor(proxy: MainThreadConfigurationShape, config: WorkspaceConfigurationNode) { + constructor(proxy: MainThreadConfigurationShape, data: IWorkspaceConfiguration) { super(); this._proxy = proxy; - this._config = config; + this._configuration = createUsefulConfiguration(data); } get onDidChangeConfiguration(): Event { return this._onDidChangeConfiguration && this._onDidChangeConfiguration.event; } - public $acceptConfigurationChanged(config: WorkspaceConfigurationNode) { - this._config = config; + public $acceptConfigurationChanged(data: IWorkspaceConfiguration) { + this._configuration = createUsefulConfiguration(data); this._onDidChangeConfiguration.fire(undefined); } public getConfiguration(section?: string): WorkspaceConfiguration { const config = section - ? ExtHostConfiguration._lookUp(section, this._config) - : this._config; + ? lookUp(this._configuration.valueTree, section) + : this._configuration.valueTree; const result: WorkspaceConfiguration = { has(key: string): boolean { - return typeof ExtHostConfiguration._lookUp(key, config) !== 'undefined'; + return typeof lookUp(config, key) !== 'undefined'; }, - get(key: string, defaultValue?: T): any { - let result = ExtHostConfiguration._lookUp(key, config); + get(key: string, defaultValue?: T): T { + let result = lookUp(config, key); if (typeof result === 'undefined') { - return defaultValue; - } else if (isConfigurationValue(result)) { - return result.value; - } else { - return ExtHostConfiguration._values(result); + result = defaultValue; } + return result; }, update: (key: string, value: any, global: boolean = false) => { key = section ? `${section}.${key}` : key; @@ -61,65 +106,24 @@ export class ExtHostConfiguration extends ExtHostConfigurationShape { return this._proxy.$removeConfigurationOption(target, key); } }, - inspect(key: string) { - let result = ExtHostConfiguration._lookUp(key, config); - if (isConfigurationValue(result)) { + inspect: (key: string): { key: string; defaultValue?: T; globalValue?: T; workspaceValue?: T } => { + key = section ? `${section}.${key}` : key; + const config = this._configuration.data[key]; + if (config) { return { - key: section ? `${section}.${key}` : key, - defaultValue: result.default, - globalValue: result.user, - workspaceValue: result.workspace + key, + defaultValue: config.default, + globalValue: config.user, + workspaceValue: config.workspace }; } } }; - if (!isConfigurationValue(config)) { - mixin(result, ExtHostConfiguration._values(config), false); + if (typeof config === 'object') { + mixin(result, config, false); } return Object.freeze(result); - - } - - private static _lookUp(section: string, config: WorkspaceConfigurationNode): WorkspaceConfigurationNode | IWorkspaceConfigurationValue { - if (!section) { - return; - } - let parts = section.split('.'); - let node = config; - while (node && parts.length) { - let child = node[parts.shift()]; - if (isConfigurationValue(child)) { - return child; - } else { - node = child; - } - } - - return node; - } - - private static _values(node: WorkspaceConfigurationNode): any { - let target = Object.create(null); - for (let key in node) { - let child = node[key]; - if (isConfigurationValue(child)) { - target[key] = child.value; - } else { - target[key] = ExtHostConfiguration._values(child); - } - } - return target; } } - -function isConfigurationValue(thing: any): thing is IWorkspaceConfigurationValue { - return typeof thing === 'object' - // must have 'value' - && typeof (>thing).value !== 'undefined' - // and at least one source 'default', 'user', or 'workspace' - && (typeof (>thing).default !== 'undefined' - || typeof (>thing).user !== 'undefined' - || typeof (>thing).workspace !== 'undefined'); -} diff --git a/src/vs/workbench/api/node/extHostDocuments.ts b/src/vs/workbench/api/node/extHostDocuments.ts index 8f7b18db3ff..7b9eaf556da 100644 --- a/src/vs/workbench/api/node/extHostDocuments.ts +++ b/src/vs/workbench/api/node/extHostDocuments.ts @@ -5,6 +5,7 @@ 'use strict'; import { onUnexpectedError } from 'vs/base/common/errors'; +import { regExpLeadsToEndlessLoop } from 'vs/base/common/strings'; import * as editorCommon from 'vs/editor/common/editorCommon'; import { MirrorModel2 } from 'vs/editor/common/model/mirrorModel2'; import { IThreadService } from 'vs/workbench/services/thread/common/threadService'; @@ -262,7 +263,7 @@ export class ExtHostDocumentData extends MirrorModel2 { positionAt(offset) { return data.positionAt(offset); }, validateRange(ran) { return data.validateRange(ran); }, validatePosition(pos) { return data.validatePosition(pos); }, - getWordRangeAtPosition(pos) { return data.getWordRangeAtPosition(pos); } + getWordRangeAtPosition(pos, regexp?) { return data.getWordRangeAtPosition(pos, regexp); } }; } return this._document; @@ -410,12 +411,14 @@ export class ExtHostDocumentData extends MirrorModel2 { return new Position(line, character); } - getWordRangeAtPosition(_position: vscode.Position): vscode.Range { + getWordRangeAtPosition(_position: vscode.Position, regexp?: RegExp): vscode.Range { let position = this.validatePosition(_position); - + if (!regexp || regExpLeadsToEndlessLoop(regexp)) { + regexp = getWordDefinitionFor(this._languageId); + } let wordAtText = getWordAtText( position.character + 1, - ensureValidWordDefinition(getWordDefinitionFor(this._languageId)), + ensureValidWordDefinition(regexp), this._lines[position.line], 0 ); diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts index c872dadf205..dfce64cc6fb 100644 --- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts +++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts @@ -21,7 +21,6 @@ import { IWorkspaceSymbolProvider, IWorkspaceSymbol } from 'vs/workbench/parts/s import { asWinJsPromise } from 'vs/base/common/async'; import { MainContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, ObjectIdentifier } from './extHost.protocol'; import { regExpLeadsToEndlessLoop } from 'vs/base/common/strings'; -import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'; // --- adapter @@ -414,14 +413,12 @@ class SuggestAdapter { private _commands: CommandsConverter; private _heapService: ExtHostHeapService; private _provider: vscode.CompletionItemProvider; - private _extension: IExtensionDescription; - constructor(documents: ExtHostDocuments, commands: CommandsConverter, heapService: ExtHostHeapService, provider: vscode.CompletionItemProvider, extension?: IExtensionDescription) { + constructor(documents: ExtHostDocuments, commands: CommandsConverter, heapService: ExtHostHeapService, provider: vscode.CompletionItemProvider) { this._documents = documents; this._commands = commands; this._heapService = heapService; this._provider = provider; - this._extension = extension; } provideCompletionItems(resource: URI, position: IPosition): TPromise { @@ -825,9 +822,9 @@ export class ExtHostLanguageFeatures extends ExtHostLanguageFeaturesShape { // --- suggestion - registerCompletionItemProvider(selector: vscode.DocumentSelector, provider: vscode.CompletionItemProvider, triggerCharacters: string[], extension?: IExtensionDescription): vscode.Disposable { + registerCompletionItemProvider(selector: vscode.DocumentSelector, provider: vscode.CompletionItemProvider, triggerCharacters: string[]): vscode.Disposable { const handle = this._nextHandle(); - this._adapter[handle] = new SuggestAdapter(this._documents, this._commands.converter, this._heapService, provider, extension); + this._adapter[handle] = new SuggestAdapter(this._documents, this._commands.converter, this._heapService, provider); this._proxy.$registerSuggestSupport(handle, selector, triggerCharacters); return this._createDisposable(handle); } diff --git a/src/vs/workbench/api/node/mainThreadConfiguration.ts b/src/vs/workbench/api/node/mainThreadConfiguration.ts index 45b530920f8..486d4023598 100644 --- a/src/vs/workbench/api/node/mainThreadConfiguration.ts +++ b/src/vs/workbench/api/node/mainThreadConfiguration.ts @@ -7,7 +7,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { IThreadService } from 'vs/workbench/services/thread/common/threadService'; -import { IWorkspaceConfigurationService, getWorkspaceConfigurationTree } from 'vs/workbench/services/configuration/common/configuration'; +import { IWorkspaceConfigurationService, getEntries } from 'vs/workbench/services/configuration/common/configuration'; import { IConfigurationEditingService, ConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditing'; import { MainThreadConfigurationShape, ExtHostContext } from './extHost.protocol'; @@ -26,8 +26,8 @@ export class MainThreadConfiguration extends MainThreadConfigurationShape { const proxy = threadService.get(ExtHostContext.ExtHostConfiguration); this._toDispose = configurationService.onDidUpdateConfiguration(() => { - const tree = getWorkspaceConfigurationTree(configurationService); - proxy.$acceptConfigurationChanged(tree); + const entries = getEntries(configurationService); + proxy.$acceptConfigurationChanged(entries); }); } diff --git a/src/vs/workbench/api/node/mainThreadEditors.ts b/src/vs/workbench/api/node/mainThreadEditors.ts index 6743426a719..654ef1947dc 100644 --- a/src/vs/workbench/api/node/mainThreadEditors.ts +++ b/src/vs/workbench/api/node/mainThreadEditors.ts @@ -190,7 +190,22 @@ export class MainThreadEditors extends MainThreadEditorsShape { return; } - return new TPromise(c => { + const findEditor = (): string => { + // find the editor we have just opened and return the + // id we have assigned to it. + for (let id in this._textEditorsMap) { + if (this._textEditorsMap[id].matches(editor)) { + return id; + } + } + }; + + const syncEditorId = findEditor(); + if (syncEditorId) { + return TPromise.as(syncEditorId); + } + + return new TPromise(resolve => { // not very nice but the way it is: changes to the editor state aren't // send to the ext host as they happen but stuff is delayed a little. in // order to provide the real editor on #openTextEditor we need to sync on @@ -200,7 +215,7 @@ export class MainThreadEditors extends MainThreadEditorsShape { function contd() { subscription.dispose(); clearTimeout(handle); - c(undefined); + resolve(undefined); } subscription = this._editorTracker.onDidUpdateTextEditors(() => { contd(); @@ -209,15 +224,7 @@ export class MainThreadEditors extends MainThreadEditorsShape { contd(); }, 1000); - }).then(() => { - // find the editor we have just opened and return the - // id we have assigned to it. - for (let id in this._textEditorsMap) { - if (this._textEditorsMap[id].matches(editor)) { - return id; - } - } - }); + }).then(findEditor); }); } diff --git a/src/vs/workbench/browser/actions/toggleZenMode.ts b/src/vs/workbench/browser/actions/toggleFocusMode.ts similarity index 71% rename from src/vs/workbench/browser/actions/toggleZenMode.ts rename to src/vs/workbench/browser/actions/toggleFocusMode.ts index b9a13bea08d..9a0c417d23a 100644 --- a/src/vs/workbench/browser/actions/toggleZenMode.ts +++ b/src/vs/workbench/browser/actions/toggleFocusMode.ts @@ -6,16 +6,16 @@ import { TPromise } from 'vs/base/common/winjs.base'; import nls = require('vs/nls'); import { Action } from 'vs/base/common/actions'; -import { KeyCode, KeyMod, KeyChord } from 'vs/base/common/keyCodes'; +import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { Registry } from 'vs/platform/platform'; import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actionRegistry'; import { IPartService } from 'vs/workbench/services/part/common/partService'; -class ToggleZenMode extends Action { +class ToggleFocusMode extends Action { - public static ID = 'workbench.action.toggleZenMode'; - public static LABEL = nls.localize('toggleZenMode', "Toggle Zen Mode"); + public static ID = 'workbench.action.toggleFocusMode'; + public static LABEL = nls.localize('toggle', "Toggle Focus Mode"); constructor( id: string, @@ -27,10 +27,10 @@ class ToggleZenMode extends Action { } public run(): TPromise { - this.partService.toggleZenMode(); + this.partService.toggleFocusMode(); return TPromise.as(null); } } let registry = Registry.as(Extensions.WorkbenchActions); -registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleZenMode, ToggleZenMode.ID, ToggleZenMode.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_Z) }), 'View: Toggle Zen Mode', nls.localize('view', "View")); +registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleFocusMode, ToggleFocusMode.ID, ToggleFocusMode.LABEL, { primary: KeyMod.Shift | KeyCode.F11, mac: { primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KEY_F } }), 'Toggle Focus Mode'); diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts index b757f02912a..3e6817ec209 100644 --- a/src/vs/workbench/browser/parts/editor/titleControl.ts +++ b/src/vs/workbench/browser/parts/editor/titleControl.ts @@ -37,7 +37,7 @@ import { CloseEditorsInGroupAction, SplitEditorAction, CloseEditorAction, KeepEd import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { createActionItem, fillInActions } from 'vs/platform/actions/browser/menuItemActionItem'; import { IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions'; -import { ResourceContextKey } from 'vs/platform/actions/common/resourceContextKey'; +import { ResourceContextKey } from 'vs/workbench/common/resourceContextKey'; export interface IToolbarActions { primary: IAction[]; @@ -504,4 +504,4 @@ export abstract class TitleControl implements ITitleAreaControl { // Toolbar this.editorActionsToolbar.dispose(); } -} \ No newline at end of file +} diff --git a/src/vs/platform/actions/common/resourceContextKey.ts b/src/vs/workbench/common/resourceContextKey.ts similarity index 100% rename from src/vs/platform/actions/common/resourceContextKey.ts rename to src/vs/workbench/common/resourceContextKey.ts diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index bb004e8b396..b989aaa6f74 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -27,7 +27,7 @@ import { IExtensionManagementService, LocalExtensionType, ILocalExtension } from import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import paths = require('vs/base/common/paths'); -import { isMacintosh } from 'vs/base/common/platform'; +import { isMacintosh, isLinux } from 'vs/base/common/platform'; import { IQuickOpenService, IFilePickOpenEntry, ISeparator } from 'vs/workbench/services/quickopen/common/quickOpenService'; import { KeyMod } from 'vs/base/common/keyCodes'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; @@ -616,6 +616,27 @@ Steps to Reproduce: } } +export class KeybindingsReferenceAction extends Action { + + public static ID = 'workbench.action.keybindingsReference'; + public static LABEL = nls.localize('keybindingsReference', "Keyboard Shortcuts Reference"); + + private static URL = isLinux ? product.keyboardShortcutsUrlLinux : isMacintosh ? product.keyboardShortcutsUrlMac : product.keyboardShortcutsUrlWin; + public static AVAILABLE = !!KeybindingsReferenceAction.URL; + + constructor( + id: string, + label: string + ) { + super(id, label); + } + + public run(): TPromise { + window.open(KeybindingsReferenceAction.URL); + return null; + } +} + // --- commands CommandsRegistry.registerCommand('_workbench.diff', function (accessor: ServicesAccessor, args: [URI, URI, string]) { diff --git a/src/vs/workbench/electron-browser/extensionHost.ts b/src/vs/workbench/electron-browser/extensionHost.ts index 78a0c3bd79d..d40c4e369b2 100644 --- a/src/vs/workbench/electron-browser/extensionHost.ts +++ b/src/vs/workbench/electron-browser/extensionHost.ts @@ -30,7 +30,7 @@ import { WatchDog } from 'vs/base/common/watchDog'; import { createQueuedSender, IQueuedSender } from 'vs/base/node/processes'; import { IInitData } from 'vs/workbench/api/node/extHost.protocol'; import { MainProcessExtensionService } from 'vs/workbench/api/node/mainThreadExtensionService'; -import { IWorkspaceConfigurationService, getWorkspaceConfigurationTree } from 'vs/workbench/services/configuration/common/configuration'; +import { IWorkspaceConfigurationService, getEntries } from 'vs/workbench/services/configuration/common/configuration'; export const EXTENSION_LOG_BROADCAST_CHANNEL = 'vscode:extensionLog'; export const EXTENSION_ATTACH_BROADCAST_CHANNEL = 'vscode:extensionAttach'; @@ -260,7 +260,7 @@ export class ExtensionHostProcessWorker { workspace: this.contextService.getWorkspace() }, extensions: extensionDescriptions, - configuration: getWorkspaceConfigurationTree(this.configurationService), + configuration: getEntries(this.configurationService), telemetryInfo }; this.extensionHostProcessQueuedSender.send(stringify(initData)); diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts index a7ea4f57f9f..04e33c25d11 100644 --- a/src/vs/workbench/electron-browser/main.contribution.ts +++ b/src/vs/workbench/electron-browser/main.contribution.ts @@ -18,8 +18,8 @@ import { IKeybindings } from 'vs/platform/keybinding/common/keybinding'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { IWindowIPCService } from 'vs/workbench/services/window/electron-browser/windowService'; -import { CloseEditorAction, ReportIssueAction, ZoomResetAction, ZoomOutAction, ZoomInAction, ToggleFullScreenAction, ToggleMenuBarAction, CloseFolderAction, CloseWindowAction, SwitchWindow, NewWindowAction, CloseMessagesAction } from 'vs/workbench/electron-browser/actions'; -import { MessagesVisibleContext, NoEditorsVisibleContext, InZenModeContext } from 'vs/workbench/electron-browser/workbench'; +import { CloseEditorAction, KeybindingsReferenceAction, ReportIssueAction, ZoomResetAction, ZoomOutAction, ZoomInAction, ToggleFullScreenAction, ToggleMenuBarAction, CloseFolderAction, CloseWindowAction, SwitchWindow, NewWindowAction, CloseMessagesAction } from 'vs/workbench/electron-browser/actions'; +import { MessagesVisibleContext, NoEditorsVisibleContext, InFocusModeContext } from 'vs/workbench/electron-browser/workbench'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; const closeEditorOrWindowKeybindings: IKeybindings = { primary: KeyMod.CtrlCmd | KeyCode.KEY_W, win: { primary: KeyMod.CtrlCmd | KeyCode.F4, secondary: [KeyMod.CtrlCmd | KeyCode.KEY_W] } }; @@ -36,6 +36,9 @@ workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(CloseF if (!!product.reportIssueUrl) { workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ReportIssueAction, ReportIssueAction.ID, ReportIssueAction.LABEL), 'Help: Report Issues', helpCategory); } +if (KeybindingsReferenceAction.AVAILABLE) { + workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(KeybindingsReferenceAction, KeybindingsReferenceAction.ID, KeybindingsReferenceAction.LABEL), 'Help: Keyboard Shortcuts Reference', helpCategory); +} workbenchActionsRegistry.registerWorkbenchAction( new SyncActionDescriptor(ZoomInAction, ZoomInAction.ID, ZoomInAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.US_EQUAL, @@ -73,14 +76,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ }); KeybindingsRegistry.registerCommandAndKeybindingRule({ - id: 'workbench.action.exitZenMode', + id: 'workbench.action.exitFocusMode', weight: 0, handler(accessor: ServicesAccessor, configurationOrName: any) { const partService = accessor.get(IPartService); - partService.toggleZenMode(); + partService.toggleFocusMode(); }, - when: InZenModeContext, - primary: KeyCode.Escape + when: InFocusModeContext, + primary: KeyChord(KeyCode.Escape, KeyCode.Escape) }); // Configuration: Workbench @@ -169,10 +172,10 @@ let properties: { [path: string]: IJSONSchema; } = { 'default': false, 'description': nls.localize('restoreFullscreen', "Controls if a window should restore to full screen mode if it was exited in full screen mode.") }, - 'window.fullScreenZenMode': { + 'window.fullScreenFocusMode': { 'type': 'boolean', 'default': true, - 'description': nls.localize('fullScreenZenMode', "Controls if zen mode should transition the workbench to full screen mode automatically.") + 'description': nls.localize('fullScreenFocusMode', "Controls if focus mode should transition the workbench to full screen mode automatically.") }, 'window.zoomLevel': { 'type': 'number', diff --git a/src/vs/workbench/electron-browser/workbench.main.ts b/src/vs/workbench/electron-browser/workbench.main.ts index 1607c8546a7..8c714f75c97 100644 --- a/src/vs/workbench/electron-browser/workbench.main.ts +++ b/src/vs/workbench/electron-browser/workbench.main.ts @@ -25,7 +25,7 @@ import 'vs/workbench/browser/actions/toggleStatusbarVisibility'; import 'vs/workbench/browser/actions/toggleSidebarVisibility'; import 'vs/workbench/browser/actions/toggleSidebarPosition'; import 'vs/workbench/browser/actions/toggleEditorLayout'; -import 'vs/workbench/browser/actions/toggleZenMode'; +import 'vs/workbench/browser/actions/toggleFocusMode'; import 'vs/workbench/parts/settings/browser/openSettings.contribution'; import 'vs/workbench/browser/actions/configureLocale'; @@ -104,4 +104,4 @@ import 'vs/workbench/electron-browser/main'; import 'vs/workbench/parts/themes/test/electron-browser/themes.test.contribution'; -import 'vs/workbench/parts/watermark/browser/watermark'; \ No newline at end of file +import 'vs/workbench/parts/watermark/electron-browser/watermark'; \ No newline at end of file diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index e6888542638..9af4802801e 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -91,7 +91,7 @@ import { IWindowConfiguration } from 'vs/workbench/electron-browser/common'; export const MessagesVisibleContext = new RawContextKey('globalMessageVisible', false); export const EditorsVisibleContext = new RawContextKey('editorIsOpen', false); -export const InZenModeContext = new RawContextKey('inZenMode', false); +export const InFocusModeContext = new RawContextKey('inFocusMode', false); export const NoEditorsVisibleContext: ContextKeyExpr = EditorsVisibleContext.toNegated(); interface WorkbenchParams { @@ -166,9 +166,9 @@ export class Workbench implements IPartService { private editorBackgroundDelayer: Delayer; private messagesVisibleContext: IContextKey; private editorsVisibleContext: IContextKey; - private inZenMode: IContextKey; + private inFocusMode: IContextKey; private hasFilesToCreateOpenOrDiff: boolean; - private zenMode: { + private focusMode: { active: boolean; transitionedToFullScreen: boolean; isPartVisible: { [part: string]: boolean }; @@ -244,7 +244,7 @@ export class Workbench implements IPartService { // Contexts this.messagesVisibleContext = MessagesVisibleContext.bindTo(this.contextKeyService); this.editorsVisibleContext = EditorsVisibleContext.bindTo(this.contextKeyService); - this.inZenMode = InZenModeContext.bindTo(this.contextKeyService); + this.inFocusMode = InFocusModeContext.bindTo(this.contextKeyService); // Register Listeners this.registerListeners(); @@ -527,8 +527,8 @@ export class Workbench implements IPartService { const activityBarVisible = this.configurationService.lookup(Workbench.activityBarVisibleConfigurationKey).value; this.activityBarHidden = !activityBarVisible; - // Zen mode - this.zenMode = { + // Focus mode + this.focusMode = { active: false, isPartVisible: {}, transitionedToFullScreen: false @@ -589,18 +589,18 @@ export class Workbench implements IPartService { } public isVisible(part: Parts): boolean { - const checkZenMode = (part: Parts) => !this.zenMode.active || this.zenMode.isPartVisible[part.toString()]; + const checkFocusMode = (part: Parts) => !this.focusMode.active || this.focusMode.isPartVisible[part.toString()]; switch (part) { case Parts.TITLEBAR_PART: return this.getCustomTitleBarStyle() && !browser.isFullscreen(); case Parts.SIDEBAR_PART: - return !this.sideBarHidden && checkZenMode(Parts.SIDEBAR_PART); + return !this.sideBarHidden && checkFocusMode(Parts.SIDEBAR_PART); case Parts.PANEL_PART: - return !this.panelHidden && checkZenMode(Parts.PANEL_PART); + return !this.panelHidden && checkFocusMode(Parts.PANEL_PART); case Parts.STATUSBAR_PART: - return !this.statusBarHidden && checkZenMode(Parts.STATUSBAR_PART); + return !this.statusBarHidden && checkFocusMode(Parts.STATUSBAR_PART); case Parts.ACTIVITYBAR_PART: - return !this.activityBarHidden && checkZenMode(Parts.ACTIVITYBAR_PART); + return !this.activityBarHidden && checkFocusMode(Parts.ACTIVITYBAR_PART); } return true; // any other part cannot be hidden @@ -637,8 +637,8 @@ export class Workbench implements IPartService { } private setStatusBarHidden(hidden: boolean, skipLayout?: boolean): void { - if (this.zenMode.active) { - this.zenMode.isPartVisible[Parts.STATUSBAR_PART.toString()] = !hidden; + if (this.focusMode.active) { + this.focusMode.isPartVisible[Parts.STATUSBAR_PART.toString()] = !hidden; } this.statusBarHidden = hidden; @@ -650,8 +650,8 @@ export class Workbench implements IPartService { } public setActivityBarHidden(hidden: boolean, skipLayout?: boolean): void { - if (this.zenMode.active) { - this.zenMode.isPartVisible[Parts.ACTIVITYBAR_PART.toString()] = !hidden; + if (this.focusMode.active) { + this.focusMode.isPartVisible[Parts.ACTIVITYBAR_PART.toString()] = !hidden; } this.activityBarHidden = hidden; @@ -663,8 +663,8 @@ export class Workbench implements IPartService { } public setSideBarHidden(hidden: boolean, skipLayout?: boolean): void { - if (this.zenMode.active) { - this.zenMode.isPartVisible[Parts.SIDEBAR_PART.toString()] = !hidden; + if (this.focusMode.active) { + this.focusMode.isPartVisible[Parts.SIDEBAR_PART.toString()] = !hidden; } this.sideBarHidden = hidden; @@ -710,8 +710,8 @@ export class Workbench implements IPartService { } public setPanelHidden(hidden: boolean, skipLayout?: boolean): void { - if (this.zenMode.active) { - this.zenMode.isPartVisible[Parts.PANEL_PART.toString()] = !hidden; + if (this.focusMode.active) { + this.focusMode.isPartVisible[Parts.PANEL_PART.toString()] = !hidden; } this.panelHidden = hidden; @@ -833,8 +833,8 @@ export class Workbench implements IPartService { this.addClass('fullscreen'); } else { this.removeClass('fullscreen'); - if (this.zenMode.transitionedToFullScreen && this.zenMode.active) { - this.toggleZenMode(); + if (this.focusMode.transitionedToFullScreen && this.focusMode.active) { + this.toggleFocusMode(); } } @@ -1051,17 +1051,17 @@ export class Workbench implements IPartService { this.storageService.store(Workbench.sidebarRestoreSettingKey, 'true', StorageScope.WORKSPACE); } - public toggleZenMode(): void { - this.zenMode.active = !this.zenMode.active; - this.inZenMode.set(this.zenMode.active); - Object.keys(this.zenMode.isPartVisible).forEach(key => this.zenMode.isPartVisible[key] = false); - // Check if zen mode transitioned to full screen and if now we are out of zen mode -> we need to go out of full screen - let toggleFullScreen = !this.zenMode.active && this.zenMode.transitionedToFullScreen && browser.isFullscreen(); + public toggleFocusMode(): void { + this.focusMode.active = !this.focusMode.active; + this.inFocusMode.set(this.focusMode.active); + Object.keys(this.focusMode.isPartVisible).forEach(key => this.focusMode.isPartVisible[key] = false); + // Check if focus mode transitioned to full screen and if now we are out of focus mode -> we need to go out of full screen + let toggleFullScreen = !this.focusMode.active && this.focusMode.transitionedToFullScreen && browser.isFullscreen(); - if (this.zenMode.active) { + if (this.focusMode.active) { const windowConfig = this.configurationService.getConfiguration(); - toggleFullScreen = !browser.isFullscreen() && windowConfig.window.fullScreenZenMode; - this.zenMode.transitionedToFullScreen = toggleFullScreen; + toggleFullScreen = !browser.isFullscreen() && windowConfig.window.fullScreenFocusMode; + this.focusMode.transitionedToFullScreen = toggleFullScreen; } (toggleFullScreen ? this.windowService.toggleFullScreen() : TPromise.as(null)) diff --git a/src/vs/workbench/parts/debug/electron-browser/repl.ts b/src/vs/workbench/parts/debug/electron-browser/repl.ts index e7266f451e3..b5993dadc7b 100644 --- a/src/vs/workbench/parts/debug/electron-browser/repl.ts +++ b/src/vs/workbench/parts/debug/electron-browser/repl.ts @@ -269,7 +269,7 @@ export class Repl extends Panel implements IPrivateReplService { lineDecorationsWidth: 0, scrollBeyondLastLine: false, theme: this.themeService.getColorTheme(), - renderLineHighlight: false, + renderLineHighlight: 'none', fixedOverflowWidgets: true, acceptSuggestionOnEnter: false }; diff --git a/src/vs/workbench/parts/files/browser/views/explorerView.ts b/src/vs/workbench/parts/files/browser/views/explorerView.ts index 20016bf8994..f554a373d9a 100644 --- a/src/vs/workbench/parts/files/browser/views/explorerView.ts +++ b/src/vs/workbench/parts/files/browser/views/explorerView.ts @@ -39,7 +39,7 @@ import { IProgressService } from 'vs/platform/progress/common/progress'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IMessageService, Severity } from 'vs/platform/message/common/message'; import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; -import { ResourceContextKey } from 'vs/platform/actions/common/resourceContextKey'; +import { ResourceContextKey } from 'vs/workbench/common/resourceContextKey'; export class ExplorerView extends CollapsibleViewletView { @@ -845,4 +845,4 @@ export class ExplorerView extends CollapsibleViewletView { super.dispose(); } -} \ No newline at end of file +} diff --git a/src/vs/workbench/parts/git/electron-browser/electronGitService.ts b/src/vs/workbench/parts/git/electron-browser/electronGitService.ts index bfe19534568..effec71bd42 100644 --- a/src/vs/workbench/parts/git/electron-browser/electronGitService.ts +++ b/src/vs/workbench/parts/git/electron-browser/electronGitService.ts @@ -169,23 +169,23 @@ interface IRawGitServiceBootstrap { } function createRawGitService(gitPath: string, execPath: string, workspaceRoot: string, encoding: string, verbose: boolean): IRawGitService { - const promise = new TPromise((c, e) => { - require(['vs/workbench/parts/git/node/rawGitServiceBootstrap'], ({ createRawGitService }: IRawGitServiceBootstrap) => { - findGit(gitPath) - .then(({ path, version }) => createRawGitService(path, workspaceRoot, encoding, execPath, version)) - .done(c, e); - }, e); + const requirePromise = new TPromise((c, e) => { + return require(['vs/workbench/parts/git/node/rawGitServiceBootstrap'], c, e); }); - return new DelayedRawGitService(promise); + const servicePromise = requirePromise.then(({ createRawGitService }) => { + return findGit(gitPath) + .then(({ path, version }) => createRawGitService(path, workspaceRoot, encoding, execPath, version)) + .then(null, () => new RawGitService(null)); + }); + + return new DelayedRawGitService(servicePromise); } function createUnscopedRawGitService(gitPath: string, execPath: string, encoding: string): IRawGitService { - const promise = new TPromise((c, e) => { - findGit(gitPath) - .then(({ path, version }) => new UnscopedGitService(path, version, encoding, execPath)) - .done(c, e); - }); + const promise = findGit(gitPath) + .then(({ path, version }) => new UnscopedGitService(path, version, encoding, execPath)) + .then(null, () => new RawGitService(null)); return new DelayedRawGitService(promise); } diff --git a/src/vs/workbench/parts/output/browser/outputPanel.ts b/src/vs/workbench/parts/output/browser/outputPanel.ts index 390428c6178..9da095b094e 100644 --- a/src/vs/workbench/parts/output/browser/outputPanel.ts +++ b/src/vs/workbench/parts/output/browser/outputPanel.ts @@ -90,7 +90,7 @@ export class OutputPanel extends StringEditor { options.rulers = []; options.folding = false; options.scrollBeyondLastLine = false; - options.renderLineHighlight = false; + options.renderLineHighlight = 'none'; const channel = this.outputService.getActiveChannel(); options.ariaLabel = channel ? nls.localize('outputPanelWithInputAriaLabel', "{0}, Output panel", channel.label) : nls.localize('outputPanelAriaLabel', "Output panel"); diff --git a/src/vs/workbench/parts/watermark/browser/watermark.ts b/src/vs/workbench/parts/watermark/browser/watermark.ts deleted file mode 100644 index 1fd0b79ed1c..00000000000 --- a/src/vs/workbench/parts/watermark/browser/watermark.ts +++ /dev/null @@ -1,124 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -'use strict'; - -import 'vs/css!./watermark'; -import { $ } from 'vs/base/browser/builder'; -import { IDisposable, dispose } from 'vs/base/common/lifecycle'; -import { isMacintosh } from 'vs/base/common/platform'; -import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; -import * as nls from 'vs/nls'; -import { Parts, IPartService } from 'vs/workbench/services/part/common/partService'; -import { Registry } from 'vs/platform/platform'; -import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; -import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; -import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; -import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; - -interface WatermarkEntry { - text: string; - ids: string[]; - folder?: boolean; -} - -const entries: WatermarkEntry[] = [ - { - text: nls.localize('watermark.showCommands', "Show All Commands"), - ids: ['workbench.action.showCommands'] - }, - { - text: nls.localize('watermark.quickOpen', "Go to File"), - ids: ['workbench.action.quickOpen'], - folder: true - }, - isMacintosh ? - { - text: nls.localize('watermark.openFileFolder', "Open File or Folder"), - ids: ['workbench.action.files.openFileFolder'], - folder: false - } - : - { - text: nls.localize('watermark.openFile', "Open File"), - ids: ['workbench.action.files.openFile'], - folder: false - } - , - { - text: nls.localize('watermark.moveLines', "Move Lines Up/Down"), - ids: ['editor.action.moveLinesUpAction', 'editor.action.moveLinesDownAction'] - }, - { - text: nls.localize('watermark.addCursor', "Add Cursors Above/Below"), - ids: ['editor.action.insertCursorAbove', 'editor.action.insertCursorBelow'] - }, - { - text: nls.localize({ key: 'watermark.toggleTerminal', comment: ['toggle is a verb here'] }, "Toggle Terminal"), - ids: ['workbench.action.terminal.toggleTerminal'] - }, -]; - -const UNBOUND = nls.localize('watermark.unboundCommand', "unbound"); - -export class WatermarkContribution implements IWorkbenchContribution { - - private toDispose: IDisposable[] = []; - - constructor( - @ILifecycleService lifecycleService: ILifecycleService, - @IPartService private partService: IPartService, - @IKeybindingService private keybindingService: IKeybindingService, - @IWorkspaceContextService private contextService: IWorkspaceContextService, - @ITelemetryService telemetryService: ITelemetryService - ) { - if (telemetryService.getExperiments().showCommandsWatermark) { - lifecycleService.onShutdown(this.dispose, this); - this.partService.joinCreation().then(() => { - this.create(); - }); - } - } - - public getId() { - return 'vs.watermark'; - } - - private create(): void { - const container = this.partService.getContainer(Parts.EDITOR_PART); - $(container).addClass('has-watermark'); - const watermark = $() - .div({ 'class': 'watermark' }); - const box = $(watermark) - .div({ 'class': 'watermark-box' }); - const folder = !!this.contextService.getWorkspace(); - const selected = entries.filter(entry => !('folder' in entry) || entry.folder === folder); - const update = () => { - const builder = $(box); - builder.clearChildren(); - selected.map(entry => { - builder.element('dl', {}, dl => { - dl.element('dt', {}, dt => dt.text(entry.text)); - dl.element('dd', {}, dd => dd.innerHtml( - entry.ids - .map(id => this.keybindingService.lookupKeybindings(id).slice(0, 1) - .map(k => `${this.keybindingService.getLabelFor(k)}`) - .join('') || UNBOUND) - .join(' / ') - )); - }); - }); - }; - update(); - watermark.build(container, 0); - this.toDispose.push(this.keybindingService.onDidUpdateKeybindings(update)); - } - - public dispose(): void { - this.toDispose = dispose(this.toDispose); - } -} - -Registry.as(WorkbenchExtensions.Workbench) - .registerWorkbenchContribution(WatermarkContribution); diff --git a/src/vs/workbench/parts/watermark/browser/watermark.css b/src/vs/workbench/parts/watermark/electron-browser/watermark.css similarity index 100% rename from src/vs/workbench/parts/watermark/browser/watermark.css rename to src/vs/workbench/parts/watermark/electron-browser/watermark.css diff --git a/src/vs/workbench/parts/watermark/electron-browser/watermark.ts b/src/vs/workbench/parts/watermark/electron-browser/watermark.ts new file mode 100644 index 00000000000..ba9bc22a2cf --- /dev/null +++ b/src/vs/workbench/parts/watermark/electron-browser/watermark.ts @@ -0,0 +1,186 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +'use strict'; + +import 'vs/css!./watermark'; +import { $ } from 'vs/base/browser/builder'; +import { IDisposable, dispose } from 'vs/base/common/lifecycle'; +import { assign } from 'vs/base/common/objects'; +import { isMacintosh } from 'vs/base/common/platform'; +import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; +import * as nls from 'vs/nls'; +import { KeybindingsReferenceAction } from 'vs/workbench/electron-browser/actions'; +import { Parts, IPartService } from 'vs/workbench/services/part/common/partService'; +import { Registry } from 'vs/platform/platform'; +import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; +import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; +import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; +import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; + +interface WatermarkEntry { + text: string; + ids: string[]; + mac?: boolean; +} + +const showCommands: WatermarkEntry = { + text: nls.localize('watermark.showCommands', "Show All Commands"), + ids: ['workbench.action.showCommands'] +}; +const quickOpen: WatermarkEntry = { + text: nls.localize('watermark.quickOpen', "Go to File"), + ids: ['workbench.action.quickOpen'] +}; +const openFileNonMacOnly: WatermarkEntry = { + text: nls.localize('watermark.openFile', "Open File"), + ids: ['workbench.action.files.openFile'], + mac: false +}; +const openFolderNonMacOnly: WatermarkEntry = { + text: nls.localize('watermark.openFolder', "Open Folder"), + ids: ['workbench.action.files.openFolder'], + mac: false +}; +const openFileOrFolderMacOnly: WatermarkEntry = { + text: nls.localize('watermark.openFileFolder', "Open File or Folder"), + ids: ['workbench.action.files.openFileFolder'], + mac: true +}; +const openRecent: WatermarkEntry = { + text: nls.localize('watermark.openRecent', "Open Recent"), + ids: ['workbench.action.openRecent'] +}; +const newUntitledFile: WatermarkEntry = { + text: nls.localize('watermark.newUntitledFile', "New Untitled File"), + ids: ['workbench.action.files.newUntitledFile'] +}; +const newUntitledFileMacOnly: WatermarkEntry = assign({ mac: true }, newUntitledFile); +const toggleTerminal: WatermarkEntry = { + text: nls.localize({ key: 'watermark.toggleTerminal', comment: ['toggle is a verb here'] }, "Toggle Terminal"), + ids: ['workbench.action.terminal.toggleTerminal'] +}; + +const findInFiles: WatermarkEntry = { + text: nls.localize('watermark.findInFiles', "Find in Files"), + ids: ['workbench.action.findInFiles'] +}; +const startDebugging: WatermarkEntry = { + text: nls.localize('watermark.startDebugging', "Start Debugging"), + ids: ['workbench.action.debug.start'] +}; + +// TODO: default keybinding +const selectTheme: WatermarkEntry = { + text: nls.localize('watermark.selectTheme', "Change Color Theme"), + ids: ['workbench.action.selectTheme'] +}; +// TODO: requires #15159 +const selectKeymap: WatermarkEntry = { + text: nls.localize('watermark.selectKeymap', "Change Keymap"), + ids: ['workbench.action.openGlobalKeybindings'] +}; +// TODO: default keybinding +const keybindingsReference: WatermarkEntry = { + text: nls.localize('watermark.keybindingsReference', "Keyboard Reference"), + ids: ['workbench.action.keybindingsReference'] +}; +// TODO: default keybinding +const openGlobalKeybindings: WatermarkEntry = { + text: nls.localize('watermark.openGlobalKeybindings', "Keyboard Shortcuts"), + ids: ['workbench.action.openGlobalKeybindings'] +}; + +const firstSessionEntries = [ + showCommands, + selectTheme, + selectKeymap, + openFolderNonMacOnly, + openFileOrFolderMacOnly, + KeybindingsReferenceAction.AVAILABLE ? keybindingsReference : openGlobalKeybindings +]; + +const noFolderEntries = [ + showCommands, + openFileNonMacOnly, + openFolderNonMacOnly, + openFileOrFolderMacOnly, + openRecent, + newUntitledFileMacOnly, + toggleTerminal +]; + +const folderEntries = [ + showCommands, + quickOpen, + findInFiles, + startDebugging, + toggleTerminal +]; + +const firstSession = false; // TODO: fix above TODOs first + +const UNBOUND = nls.localize('watermark.unboundCommand', "unbound"); + +export class WatermarkContribution implements IWorkbenchContribution { + + private toDispose: IDisposable[] = []; + + constructor( + @ILifecycleService lifecycleService: ILifecycleService, + @IPartService private partService: IPartService, + @IKeybindingService private keybindingService: IKeybindingService, + @IWorkspaceContextService private contextService: IWorkspaceContextService, + @ITelemetryService telemetryService: ITelemetryService + ) { + if (telemetryService.getExperiments().showCommandsWatermark) { + lifecycleService.onShutdown(this.dispose, this); + this.partService.joinCreation().then(() => { + this.create(); + }); + } + } + + public getId() { + return 'vs.watermark'; + } + + private create(): void { + const container = this.partService.getContainer(Parts.EDITOR_PART); + $(container).addClass('has-watermark'); + const watermark = $() + .div({ 'class': 'watermark' }); + const box = $(watermark) + .div({ 'class': 'watermark-box' }); + const folder = !!this.contextService.getWorkspace(); + const selected = (folder ? folderEntries : firstSession ? firstSessionEntries : noFolderEntries) + .filter(entry => !('mac' in entry) || entry.mac === isMacintosh); + const update = () => { + const builder = $(box); + builder.clearChildren(); + selected.map(entry => { + builder.element('dl', {}, dl => { + dl.element('dt', {}, dt => dt.text(entry.text)); + dl.element('dd', {}, dd => dd.innerHtml( + entry.ids + .map(id => this.keybindingService.lookupKeybindings(id).slice(0, 1) + .map(k => `${this.keybindingService.getLabelFor(k)}`) + .join('') || UNBOUND) + .join(' / ') + )); + }); + }); + }; + update(); + watermark.build(container, 0); + this.toDispose.push(this.keybindingService.onDidUpdateKeybindings(update)); + } + + public dispose(): void { + this.toDispose = dispose(this.toDispose); + } +} + +Registry.as(WorkbenchExtensions.Workbench) + .registerWorkbenchContribution(WatermarkContribution); diff --git a/src/vs/workbench/services/configuration/common/configuration.ts b/src/vs/workbench/services/configuration/common/configuration.ts index d8b03ca7154..22d6bce007a 100644 --- a/src/vs/workbench/services/configuration/common/configuration.ts +++ b/src/vs/workbench/services/configuration/common/configuration.ts @@ -43,12 +43,11 @@ export const WORKSPACE_STANDALONE_CONFIGURATIONS = { 'launch': `${WORKSPACE_CONFIG_FOLDER_DEFAULT_NAME}/launch.json` }; -export interface WorkspaceConfigurationNode { - [part: string]: IWorkspaceConfigurationValue | WorkspaceConfigurationNode; -} +export type IWorkspaceConfiguration = { [key: string]: IWorkspaceConfigurationValue } -export function getWorkspaceConfigurationTree(configurationService: IWorkspaceConfigurationService): WorkspaceConfigurationNode { - const result: WorkspaceConfigurationNode = Object.create(null); +export function getEntries(configurationService: IWorkspaceConfigurationService): IWorkspaceConfiguration { + + const result: IWorkspaceConfiguration = Object.create(null); const keyset = configurationService.keys(); const keys = [...keyset.workspace, ...keyset.user, ...keyset.default].sort(); let lastKey: string; @@ -56,27 +55,9 @@ export function getWorkspaceConfigurationTree(configurationService: IWorkspaceCo if (key !== lastKey) { lastKey = key; const config = configurationService.lookup(key); - insert(result, key, config); + result[key] = config; } } + return result; } - -function insert(root: WorkspaceConfigurationNode, key: string, value: any): void { - const parts = key.split('.'); - let i = 0; - while (i < parts.length - 1) { - let child = root[parts[i]]; - if (child) { - root = child; - i += 1; - } else { - break; - } - } - while (i < parts.length - 1) { - root = root[parts[i]] = Object.create(null); - i += 1; - } - root[parts[parts.length - 1]] = value; -} diff --git a/src/vs/workbench/services/part/common/partService.ts b/src/vs/workbench/services/part/common/partService.ts index 85ae1cee79e..44d67440273 100644 --- a/src/vs/workbench/services/part/common/partService.ts +++ b/src/vs/workbench/services/part/common/partService.ts @@ -119,7 +119,7 @@ export interface IPartService { setRestoreSidebar(): void; /** - * Toggles the workbench in and out of zen mode - parts get hidden and window goes fullscreen. + * Toggles the workbench in and out of focus mode - parts get hidden and window goes fullscreen. */ - toggleZenMode(): void; + toggleFocusMode(): void; } \ No newline at end of file diff --git a/src/vs/workbench/test/node/api/extHostConfiguration.test.ts b/src/vs/workbench/test/node/api/extHostConfiguration.test.ts index 39666dc89fe..2548e4d3c84 100644 --- a/src/vs/workbench/test/node/api/extHostConfiguration.test.ts +++ b/src/vs/workbench/test/node/api/extHostConfiguration.test.ts @@ -10,7 +10,7 @@ import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration import { MainThreadConfigurationShape } from 'vs/workbench/api/node/extHost.protocol'; import { TPromise } from 'vs/base/common/winjs.base'; import { ConfigurationTarget, ConfigurationEditingErrorCode, IConfigurationEditingError } from 'vs/workbench/services/configuration/common/configurationEditing'; -import { WorkspaceConfigurationNode, IWorkspaceConfigurationValue } from 'vs/workbench/services/configuration/common/configuration'; +import { IWorkspaceConfiguration, IWorkspaceConfigurationValue } from 'vs/workbench/services/configuration/common/configuration'; suite('ExtHostConfiguration', function () { @@ -22,7 +22,7 @@ suite('ExtHostConfiguration', function () { } }; - function createExtHostConfiguration(data: WorkspaceConfigurationNode = {}, shape?: MainThreadConfigurationShape) { + function createExtHostConfiguration(data: IWorkspaceConfiguration = Object.create(null), shape?: MainThreadConfigurationShape) { if (!shape) { shape = new class extends MainThreadConfigurationShape { }; } @@ -38,17 +38,26 @@ suite('ExtHostConfiguration', function () { }; } + test('getConfiguration fails regression test 1.7.1 -> 1.8 #15552', function () { + const extHostConfig = createExtHostConfiguration({ + ['search.exclude']: createConfigurationValue({ '**/node_modules': true }) + }); + + assert.equal(extHostConfig.getConfiguration('search.exclude')['**/node_modules'], true); + assert.equal(extHostConfig.getConfiguration('search.exclude').get('**/node_modules'), true); + assert.equal(extHostConfig.getConfiguration('search').get('exclude')['**/node_modules'], true); + + assert.equal(extHostConfig.getConfiguration('search.exclude').has('**/node_modules'), true); + assert.equal(extHostConfig.getConfiguration('search').has('exclude.**/node_modules'), true); + }); + test('has/get', function () { const all = createExtHostConfiguration({ - farboo: { - config0: createConfigurationValue(true), - nested: { - config1: createConfigurationValue(42), - config2: createConfigurationValue('Das Pferd frisst kein Reis.'), - }, - config4: createConfigurationValue('') - } + ['farboo.config0']: createConfigurationValue(true), + ['farboo.nested.config1']: createConfigurationValue(42), + ['farboo.nested.config2']: createConfigurationValue('Das Pferd frisst kein Reis.'), + ['farboo.config4']: createConfigurationValue('') }); const config = all.getConfiguration('farboo'); @@ -72,10 +81,8 @@ suite('ExtHostConfiguration', function () { test('getConfiguration vs get', function () { const all = createExtHostConfiguration({ - farboo: { - config0: createConfigurationValue(true), - config4: createConfigurationValue('38') - } + ['farboo.config0']: createConfigurationValue(true), + ['farboo.config4']: createConfigurationValue(38) }); let config = all.getConfiguration('farboo.config0'); @@ -90,10 +97,8 @@ suite('ExtHostConfiguration', function () { test('getConfiguration vs get', function () { const all = createExtHostConfiguration({ - farboo: { - config0: createConfigurationValue(true), - config4: createConfigurationValue('38') - } + ['farboo.config0']: createConfigurationValue(true), + ['farboo.config4']: createConfigurationValue(38) }); let config = all.getConfiguration('farboo.config0'); @@ -107,9 +112,7 @@ suite('ExtHostConfiguration', function () { test('name vs property', function () { const all = createExtHostConfiguration({ - farboo: { - get: createConfigurationValue('get-prop') - } + ['farboo.get']: createConfigurationValue('get-prop') }); const config = all.getConfiguration('farboo'); @@ -122,7 +125,10 @@ suite('ExtHostConfiguration', function () { test('udate/section to key', function () { const shape = new RecordingShape(); - const allConfig = createExtHostConfiguration({ foo: { bar: createConfigurationValue(1), far: createConfigurationValue(2) } }, shape); + const allConfig = createExtHostConfiguration({ + ['foo.bar']: createConfigurationValue(1), + ['foo.far']: createConfigurationValue(1) + }, shape); let config = allConfig.getConfiguration('foo'); config.update('bar', 42, true); diff --git a/src/vs/workbench/test/node/api/extHostDocuments.test.ts b/src/vs/workbench/test/node/api/extHostDocuments.test.ts index 93c11669a18..b20a73865ef 100644 --- a/src/vs/workbench/test/node/api/extHostDocuments.test.ts +++ b/src/vs/workbench/test/node/api/extHostDocuments.test.ts @@ -204,6 +204,39 @@ suite('ExtHostDocument', () => { assertPositionAt(99, 3, 29); assertPositionAt(Number.MAX_VALUE, 3, 29); }); + + test('getWordRangeAtPosition', function () { + data = new ExtHostDocumentData(undefined, URI.file(''), [ + 'aaaa bbbb cccc abc' + ], '\n', 'text', 1, false); + + let range = data.getWordRangeAtPosition(new Position(0, 2)); + assert.equal(range.start.line, 0); + assert.equal(range.start.character, 0); + assert.equal(range.end.line, 0); + assert.equal(range.end.character, 4); + + range = data.getWordRangeAtPosition(new Position(0, 2), /.*/); + assert.equal(range.start.line, 0); + assert.equal(range.start.character, 0); + assert.equal(range.end.line, 0); + assert.equal(range.end.character, 4); + + range = data.getWordRangeAtPosition(new Position(0, 2), /a+.+?c/); + assert.equal(range.start.line, 0); + assert.equal(range.start.character, 0); + assert.equal(range.end.line, 0); + assert.equal(range.end.character, 11); + + range = data.getWordRangeAtPosition(new Position(0, 17), /a+.+?c/); + assert.equal(range.start.line, 0); + assert.equal(range.start.character, 15); + assert.equal(range.end.line, 0); + assert.equal(range.end.character, 18); + + range = data.getWordRangeAtPosition(new Position(0, 11), /yy/); + assert.equal(range, undefined); + }); }); enum AssertDocumentLineMappingDirection { @@ -372,4 +405,4 @@ suite('ExtHostDocument updates line mapping', () => { 'and finished with the fourth.', ], [createChangeEvent(new CodeEditorRange(1, 1, 1, 1), '', '\n')]); }); -}); \ No newline at end of file +});