提交 857768fc 编写于 作者: D Dirk Baeumer

Merge branch 'master' into dbaeumer/27078

......@@ -74,13 +74,18 @@
<key>1</key>
<dict>
<key>name</key>
<string>variable.parameter.loop.begin.shell</string>
<string>variable.other.parsetime.begin.shell</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>variable.other.parsetime.end.shell</string>
</dict>
</dict>
<key>name</key>
<string>variable.parameter.loop.dosbatch</string>
<string>variable.other.parsetime.dosbatch</string>
<key>match</key>
<string>(?i)(%%)(~(?:f|d|p|n|x|s|a|t|z|\$[^:]*:)*)?[a-z]</string>
<string>(%)[^%]+(%)|(%%)[^%]+(%%)</string>
</dict>
<dict>
<key>captures</key>
......@@ -88,18 +93,13 @@
<key>1</key>
<dict>
<key>name</key>
<string>variable.other.parsetime.begin.shell</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>variable.other.parsetime.end.shell</string>
<string>variable.parameter.loop.begin.shell</string>
</dict>
</dict>
<key>name</key>
<string>variable.other.parsetime.dosbatch</string>
<string>variable.parameter.loop.dosbatch</string>
<key>match</key>
<string>(%)[^%]+(%)</string>
<string>(?i)(%%)(~(?:f|d|p|n|x|s|a|t|z|\$[^:]*:)*)?[a-z]</string>
</dict>
<dict>
<key>captures</key>
......
......@@ -16,13 +16,9 @@ if not exist out node .\node_modules\gulp\bin\gulp.js compile
:: Configuration
set NODE_ENV=development
set VSCODE_DEV=1
set ELECTRON_DEFAULT_ERROR_MODE=1
set ELECTRON_ENABLE_LOGGING=1
set ELECTRON_ENABLE_STACK_DUMPING=1
:: Launch Code
.\.build\electron\electron.exe . %*
call echo %%LINE:rem +=%%
popd
endlocal
\ No newline at end of file
......@@ -264,62 +264,18 @@
}
},
{
"c": "set",
"t": "source.dosbatch keyword.command.dosbatch",
"r": {
"dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF",
"dark_vs": "keyword: #569CD6",
"light_vs": "keyword: #0000FF",
"hc_black": "keyword: #569CD6"
}
},
{
"c": " VSCODE_DEV=1",
"t": "source.dosbatch",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "set",
"t": "source.dosbatch keyword.command.dosbatch",
"r": {
"dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF",
"dark_vs": "keyword: #569CD6",
"light_vs": "keyword: #0000FF",
"hc_black": "keyword: #569CD6"
}
},
{
"c": " ELECTRON_DEFAULT_ERROR_MODE=1",
"t": "source.dosbatch",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "set",
"t": "source.dosbatch keyword.command.dosbatch",
"c": "call",
"t": "source.dosbatch keyword.control.statement.dosbatch",
"r": {
"dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF",
"dark_vs": "keyword: #569CD6",
"light_vs": "keyword: #0000FF",
"hc_black": "keyword: #569CD6"
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
{
"c": " ELECTRON_ENABLE_LOGGING=1",
"c": " ",
"t": "source.dosbatch",
"r": {
"dark_plus": "default: #D4D4D4",
......@@ -330,7 +286,7 @@
}
},
{
"c": "set",
"c": "echo",
"t": "source.dosbatch keyword.command.dosbatch",
"r": {
"dark_plus": "keyword: #569CD6",
......@@ -341,7 +297,7 @@
}
},
{
"c": " ELECTRON_ENABLE_STACK_DUMPING=1",
"c": " ",
"t": "source.dosbatch",
"r": {
"dark_plus": "default: #D4D4D4",
......@@ -352,25 +308,14 @@
}
},
{
"c": ":: Launch Code",
"t": "source.dosbatch comment.line.colons.dosbatch",
"c": "%%LINE:rem +=%%",
"t": "source.dosbatch variable.other.parsetime.dosbatch",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"hc_black": "comment: #7CA668"
}
},
{
"c": ".\\.build\\electron\\electron.exe . %*",
"t": "source.dosbatch",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
"hc_black": "variable: #9CDCFE"
}
},
{
......
......@@ -61,7 +61,7 @@ export function activate(context: vscode.ExtensionContext) {
continue;
}
let styles = contributes['markdown.preview'] && contributes['markdown.preview'].styles;
let styles = contributes['markdown.previewStyles'];
if (styles) {
if (!Array.isArray(styles)) {
styles = [styles];
......@@ -75,7 +75,7 @@ export function activate(context: vscode.ExtensionContext) {
}
}
let scripts = contributes['markdown.preview'] && contributes['markdown.preview'].scripts;
let scripts = contributes['markdown.previewScripts'];
if (scripts) {
if (!Array.isArray(scripts)) {
scripts = [scripts];
......
......@@ -90,6 +90,8 @@ async function getNpmScriptsAsTasks(): Promise<vscode.Task[]> {
}
result.push(task);
});
// add some 'well known' npm tasks
result.push(new vscode.ShellTask(`npm: install`, `npm install`));
return Promise.resolve(result);
} catch (e) {
return Promise.resolve(emptyTasks);
......
......@@ -315,6 +315,15 @@
"type": "boolean",
"default": true,
"description": "%javascript.nameSuggestions%"
},
"typescript.tsc.autoDetect": {
"type": "string",
"default": "on",
"enum": [
"on",
"off"
],
"description": "%typescript.tsc.autoDetect%"
}
}
},
......
......@@ -37,5 +37,6 @@
"jsDocCompletion.enabled": "Enable/disable auto JSDoc comments",
"javascript.implicitProjectConfig.checkJs": "Enable/disable semantic checking of JavaScript files. Existing jsconfig.json or tsconfig.json files override this setting. Requires TypeScript >=2.3.1.",
"typescript.check.npmIsInstalled": "Check if NPM is installed for automatic typings acquisition",
"javascript.nameSuggestions": "Enable/disable including unique names from the file in JavaScript suggestion lists."
"javascript.nameSuggestions": "Enable/disable including unique names from the file in JavaScript suggestion lists.",
"typescript.tsc.autoDetect": "Controls whether auto detection of tsc tasks is on or off."
}
......@@ -21,7 +21,10 @@ const exists = (file: string): Promise<boolean> =>
});
});
export default class TypeScriptTaskProvider implements vscode.TaskProvider {
/**
* Provides tasks for building `tsconfig.json` files in a project.
*/
class TscTaskProvider implements vscode.TaskProvider {
private readonly tsconfigProvider: TsConfigProvider;
public constructor(
......@@ -45,21 +48,21 @@ export default class TypeScriptTaskProvider implements vscode.TaskProvider {
return projects.map(configFile => {
const configFileName = path.relative(rootPath, configFile);
const buildTask = new vscode.ShellTask(`tsc: build ${configFileName}`, `${command} -p ${configFile}`, '$tsc');
const buildTask = new vscode.ShellTask(`tsc: build ${configFileName}`, `${command} -p "${configFile}"`, '$tsc');
buildTask.group = vscode.TaskGroup.Build;
return buildTask;
});
}
private async getAllTsConfigs(token: vscode.CancellationToken): Promise<string[]> {
const out: string[] = [];
const out = new Set<string>();
const configs = (await this.getTsConfigForActiveFile(token)).concat(await this.getTsConfigsInWorkspace());
for (const config of configs) {
if (await exists(config)) {
out.push(config);
out.add(config);
}
}
return out;
return Array.from(out);
}
private async getTsConfigForActiveFile(token: vscode.CancellationToken): Promise<string[]> {
......@@ -116,4 +119,39 @@ export default class TypeScriptTaskProvider implements vscode.TaskProvider {
}
return null;
}
}
type AutoDetect = 'on' | 'off';
/**
* Manages registrations of TypeScript task provides with VScode.
*/
export default class TypeScriptTaskProviderManager {
private taskProviderSub: vscode.Disposable | undefined = undefined;
private readonly disposables: vscode.Disposable[] = [];
constructor(
private readonly lazyClient: () => TypeScriptServiceClient
) {
vscode.workspace.onDidChangeConfiguration(this.onConfigurationChanged, this, this.disposables);
this.onConfigurationChanged();
}
dispose() {
if (this.taskProviderSub) {
this.taskProviderSub.dispose();
this.taskProviderSub = undefined;
}
this.disposables.forEach(x => x.dispose());
}
private onConfigurationChanged() {
let autoDetect = vscode.workspace.getConfiguration('typescript.tsc').get<AutoDetect>('autoDetect');
if (this.taskProviderSub && autoDetect === 'off') {
this.taskProviderSub.dispose();
this.taskProviderSub = undefined;
} else if (!this.taskProviderSub && autoDetect === 'on') {
this.taskProviderSub = vscode.workspace.registerTaskProvider(new TscTaskProvider(this.lazyClient));
}
}
}
\ No newline at end of file
......@@ -41,7 +41,7 @@ import CodeActionProvider from './features/codeActionProvider';
import ReferenceCodeLensProvider from './features/referencesCodeLensProvider';
import { JsDocCompletionProvider, TryCompleteJsDocCommand } from './features/jsDocCompletionProvider';
import { DirectiveCommentCompletionProvider } from './features/directiveCommentCompletionProvider';
import TypeScriptTaskProvider from './features/taskProvider';
import TypeScriptTaskProviderManager from './features/taskProvider';
import ImplementationCodeLensProvider from './features/implementationsCodeLensProvider';
......@@ -131,7 +131,7 @@ export function activate(context: ExtensionContext): void {
lazyClientHost().serviceClient.restartTsServer();
}));
context.subscriptions.push(workspace.registerTaskProvider(new TypeScriptTaskProvider(() => lazyClientHost().serviceClient)));
context.subscriptions.push(new TypeScriptTaskProviderManager(() => lazyClientHost().serviceClient));
const goToProjectConfig = (isTypeScript: boolean) => {
const editor = window.activeTextEditor;
......
......@@ -26,6 +26,9 @@
"provide commit message": "请提供提交消息",
"branch name": "分支名称",
"provide branch name": "请提供分支名称",
"select branch to delete": "选择要删除的分支",
"confirm force delete branch": "“{0}”分支未被完全合并。是否仍要删除?",
"delete branch": "删除分支",
"no remotes to pull": "存储库未配置任何从其中进行拉取的远程存储库。",
"no remotes to push": "存储库未配置任何要推送到的远程存储库。",
"nobranch": "请签出一个分支以推送到远程。",
......
......@@ -26,6 +26,7 @@
"command.undoCommit": "撤消上次提交",
"command.checkout": "签出到...",
"command.branch": "创建分支...",
"command.deleteBranch": "删除分支...",
"command.pull": "拉取",
"command.pullRebase": "拉取(变基)",
"command.push": "推送",
......
......@@ -3,4 +3,6 @@
* 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
{
"acceptCurrentChange": "采用当前更改"
}
\ No newline at end of file
......@@ -3,4 +3,8 @@
* 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
{
"cursorNotInConflict": "编辑器光标不在合并冲突内",
"noConflicts": "没有在此文件中找到合并冲突",
"noOtherConflictsInThisFile": "此文件中没有其他合并冲突了"
}
\ No newline at end of file
......@@ -3,4 +3,6 @@
* 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
{
"currentChange": "(当前更改)"
}
\ No newline at end of file
......@@ -3,4 +3,10 @@
* 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
{
"command.category": "合并冲突",
"command.next": "下一个冲突",
"command.previous": "上一个冲突",
"command.compare": "比较当前冲突",
"config.title": "合并冲突"
}
\ No newline at end of file
......@@ -3,4 +3,6 @@
* 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
{
"config.npm.autoDetect": "控制自动检测 npm 脚本是否打开。默认开启。"
}
\ No newline at end of file
......@@ -6,7 +6,7 @@
{
"versionMismatch": "版本不匹配! 全局 tsc ({0}) != VS Code 的语言服务({1})。可能出现不一致的编译错误",
"moreInformation": "详细信息",
"doNotCheckAgain": "不要再次检查",
"doNotCheckAgain": "不检查",
"close": "关闭",
"updateTscCheck": "已将用户设置 \"typescript.check.tscVersion\" 更新为 false"
}
\ No newline at end of file
......@@ -37,6 +37,7 @@
"typescript.referencesCodeLens.enabled": "启用/禁用在 TypeScript 文件中引用 CodeLens。要求 TypeScript >= 2.0.6。",
"typescript.implementationsCodeLens.enabled": "启用/禁用实现 CodeLens。要求 TypeScript >= 2.2.0。",
"typescript.openTsServerLog.title": "打开 TS 服务器日志",
"typescript.restartTsServer": "重启 TS 服务器",
"typescript.selectTypeScriptVersion.title": "选择 TypeScript 版本",
"jsDocCompletion.enabled": "启用/禁用自动 JSDoc 注释",
"javascript.implicitProjectConfig.checkJs": "启用/禁用 JavaScript 文件的语义检查。现有的 jsconfig.json 或\n tsconfig.json 文件会覆盖此设置。要求 TypeScript >=2.3.1。",
......
......@@ -7,7 +7,6 @@
"ok": "确定",
"pathNotExistTitle": "路径不存在",
"pathNotExistDetail": "磁盘上似乎不再存在路径“{0}”。",
"accessibilityOptionsWindowTitle": "辅助功能选项",
"reopen": "重新打开",
"wait": "保持等待",
"close": "关闭",
......
......@@ -3,21 +3,4 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
// Do not edit this file. It is machine generated.
{
"noResultWord": "未找到“{0}”的任何定义",
"generic.noResults": "找不到定义",
"meta.title": " – {0} 定义",
"actions.goToDecl.label": "转到定义",
"actions.goToDeclToSide.label": "打开侧边的定义",
"actions.previewDecl.label": "查看定义",
"goToImplementation.noResultWord": "未找到“{0}”的实现",
"goToImplementation.generic.noResults": "未找到实现",
"meta.implementations.title": "– {0} 个实现",
"actions.goToImplementation.label": "转到实现",
"actions.peekImplementation.label": "速览实现",
"goToTypeDefinition.noResultWord": "未找到“{0}”的类型定义",
"goToTypeDefinition.generic.noResults": "未找到类型定义",
"meta.typeDefinitions.title": " – {0} 个类型定义",
"actions.goToTypeDefinition.label": "转到类型定义",
"actions.peekTypeDefinition.label": "快速查看类型定义"
}
\ No newline at end of file
{}
\ No newline at end of file
......@@ -3,6 +3,4 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
// Do not edit this file. It is machine generated.
{
"multipleResults": "单击显示 {0} 个定义。"
}
\ No newline at end of file
{}
\ No newline at end of file
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -4,7 +4,8 @@
*--------------------------------------------------------------------------------------------*/
// Do not edit this file. It is machine generated.
{
"disableOtherKeymapsConfirmation": "是否禁用其他键映射以避免键绑定之间的冲突?",
"yes": "是",
"no": "否"
"no": "否",
"uninstall": "卸载",
"later": "稍后"
}
\ No newline at end of file
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -3,4 +3,9 @@
* 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
{
"acceptCurrentChange": "接受當前變更",
"acceptIncomingChange": "接受來源變更",
"acceptBothChanges": "接受兩者變更",
"compareChanges": "比較變更"
}
\ No newline at end of file
......@@ -3,4 +3,7 @@
* 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
{
"noConflicts": "檔案內找不到需要合併衝突項目",
"noOtherConflictsInThisFile": "此檔案內沒有其他的衝突合併項目"
}
\ No newline at end of file
......@@ -3,4 +3,7 @@
* 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
{
"currentChange": "(目前變更)",
"incomingChange": "(來源變更)"
}
\ No newline at end of file
......@@ -3,4 +3,17 @@
* 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
{
"command.category": "合併衝突",
"command.accept.all-incoming": "接受所有來源",
"command.accept.all-both": "接受兩者",
"command.accept.current": "接受當前項目",
"command.accept.incoming": "接受來源",
"command.accept.selection": "接受選取項目",
"command.accept.both": "接受兩者",
"command.next": "後一個衝突",
"command.previous": "前一個衝突",
"command.compare": "比較目前衝突",
"config.title": "合併衝突",
"config.codeLensEnabled": "啟用/停用 編輯器CodeLens衝突合併 "
}
\ No newline at end of file
......@@ -3,4 +3,6 @@
* 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
{
"config.npm.autoDetect": "控制是否自動檢測npm腳本.預設為開啟."
}
\ No newline at end of file
......@@ -7,7 +7,6 @@
"ok": "確定",
"pathNotExistTitle": "路徑不存在",
"pathNotExistDetail": "磁碟上似乎已沒有路徑 '{0}'。",
"accessibilityOptionsWindowTitle": "協助工具選項",
"reopen": "重新開啟",
"wait": "繼續等候",
"close": "關閉",
......
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -4,7 +4,8 @@
*--------------------------------------------------------------------------------------------*/
// Do not edit this file. It is machine generated.
{
"disableOtherKeymapsConfirmation": "要停用其他按鍵對應,以避免按鍵繫結關係發生衝突嗎?",
"yes": "是",
"no": "否"
"no": "否",
"uninstall": "解除安裝",
"later": "稍後"
}
\ No newline at end of file
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -7,7 +7,6 @@
"ok": "OK",
"pathNotExistTitle": "Der Pfad ist nicht vorhanden.",
"pathNotExistDetail": "Der Pfad \"{0}\" scheint auf dem Datenträger nicht mehr vorhanden zu sein.",
"accessibilityOptionsWindowTitle": "Optionen für erleichterte Bedienung",
"reopen": "Erneut öffnen",
"wait": "Bitte warten.",
"close": "Schließen",
......
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -4,7 +4,8 @@
*--------------------------------------------------------------------------------------------*/
// Do not edit this file. It is machine generated.
{
"disableOtherKeymapsConfirmation": "Andere Tastenzuordnungen deaktivieren, um Konflikte zwischen Tastenzuordnungen zu vermeiden?",
"yes": "Ja",
"no": "Nein"
"no": "Nein",
"uninstall": "Deinstallieren",
"later": "Später"
}
\ No newline at end of file
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -26,6 +26,9 @@
"provide commit message": "Proporcione un mensaje de confirmación",
"branch name": "Nombre de rama",
"provide branch name": "Especifique un nombre para la rama",
"select branch to delete": "Seleccione una rama para borrar",
"confirm force delete branch": "La rama '{0}' no está completamente fusionada. ¿Borrarla de todas formas?",
"delete branch": "Borrar rama...",
"no remotes to pull": "El repositorio no tiene remotos configurados de los que extraer.",
"no remotes to push": "El repositorio no tiene remotos configurados en los que insertar.",
"nobranch": "Extraiga del repositorio una rama para insertar un remoto.",
......
......@@ -26,6 +26,7 @@
"command.undoCommit": "Deshacer última confirmación",
"command.checkout": "Desproteger en...",
"command.branch": "Crear rama...",
"command.deleteBranch": "Borrar rama...",
"command.pull": "Incorporación de cambios",
"command.pullRebase": "Incorporación de cambios (fusionar mediante cambio de base)",
"command.push": "Insertar",
......
......@@ -3,4 +3,6 @@
* 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
{
"onPreviewStyleLoadError": "No se pudo cargar 'markdown.styles': {0}"
}
\ No newline at end of file
......@@ -3,4 +3,9 @@
* 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
{
"acceptCurrentChange": "Aceptar cambio actual",
"acceptIncomingChange": "Aceptar cambio entrante",
"acceptBothChanges": "Aceptar ambos cambios",
"compareChanges": "Comparar cambios"
}
\ No newline at end of file
......@@ -3,4 +3,10 @@
* 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
{
"cursorNotInConflict": "El cursor de edición no se encuentra en un conflicto de fusión",
"compareChangesTitle": "{0}: Cambios actuales \\u2194 Cambios entrantes",
"cursorOnSplitterRange": "El cursor del editor está dentro del separador de conflictos de fusión, muévalo al bloque \"actual\" o al \"entrante\" ",
"noConflicts": "No se encontraron conflictos en este archivo",
"noOtherConflictsInThisFile": "No hay más conflictos en este archivo"
}
\ No newline at end of file
......@@ -3,4 +3,7 @@
* 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
{
"currentChange": "(Cambio actual)",
"incomingChange": "(Cambio entrante)"
}
\ No newline at end of file
......@@ -3,4 +3,18 @@
* 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
{
"command.category": "Fusionar conflicto",
"command.accept.all-incoming": "Aceptar todos los entrantes",
"command.accept.all-both": "Aceptar todos ambos",
"command.accept.current": "Aceptar actual",
"command.accept.incoming": "Aceptar entrante",
"command.accept.selection": "Aceptar selección",
"command.accept.both": "Aceptar ambos",
"command.next": "Siguiente conflicto",
"command.previous": "Conflicto anterior",
"command.compare": "Comparar conflicto actual",
"config.title": "Fusionar conflicto",
"config.codeLensEnabled": "Habilitar/deshabilitar CodeLens de fusionar bloque de conflictos en el editor",
"config.decoratorsEnabled": "Habilitar/deshabilitar decoradores de conflictos de fusión en el editor"
}
\ No newline at end of file
......@@ -3,4 +3,6 @@
* 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
{
"config.npm.autoDetect": "Controla si la detección automática de scripts npm está activada o desactivada. Por defecto está activada."
}
\ No newline at end of file
......@@ -37,6 +37,7 @@
"typescript.referencesCodeLens.enabled": "Habilitar/deshabilitar las referencias de CodeLens en los archivos de TypeScript. Requiere TypeScript >= 2.0.6.",
"typescript.implementationsCodeLens.enabled": "Habilita o deshabilita implementaciones de CodeLens. Requiere TypeScript >= 2.2.0.",
"typescript.openTsServerLog.title": "Abrir registro del servidor de TS",
"typescript.restartTsServer": "Reiniciar servidor TS",
"typescript.selectTypeScriptVersion.title": "Seleccionar versión de TypeScript",
"jsDocCompletion.enabled": "Habilita o deshabilita comentarios automaticos de JSDoc",
"javascript.implicitProjectConfig.checkJs": "Habilita/deshabilita la comprobación semántica de los archivos JavaScript. Los archivos jsconfig.json o tsconfig.json reemplazan esta configuración. Se requiere TypeScript >=2.3.1.",
......
......@@ -7,7 +7,6 @@
"ok": "Aceptar",
"pathNotExistTitle": "La ruta no existe",
"pathNotExistDetail": "Parece que la ruta '{0}' ya no existe en el disco.",
"accessibilityOptionsWindowTitle": "Opciones de accesibilidad",
"reopen": "Volver a abrir",
"wait": "Siga esperando",
"close": "Cerrar",
......
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -4,5 +4,6 @@
*--------------------------------------------------------------------------------------------*/
// Do not edit this file. It is machine generated.
{
"statusBarDebuggingBackground": "Color de fondo de la barra de estado cuando se está depurando un programa. La barra de estado se muestra en la parte inferior de la ventana"
"statusBarDebuggingBackground": "Color de fondo de la barra de estado cuando se está depurando un programa. La barra de estado se muestra en la parte inferior de la ventana",
"statusBarDebuggingForeground": "Color de primer plano de la barra de estado cuando se está depurando un programa. La barra de estado se muestra en la parte inferior de la ventana"
}
\ No newline at end of file
......@@ -4,7 +4,8 @@
*--------------------------------------------------------------------------------------------*/
// Do not edit this file. It is machine generated.
{
"disableOtherKeymapsConfirmation": "¿Quiere deshabilitar otras asignaciones de teclado para evitar conflictos entre los enlaces de teclado?",
"yes": "Sí",
"no": "No"
"no": "No",
"uninstall": "Desinstalación",
"later": "Más tarde"
}
\ No newline at end of file
......@@ -16,6 +16,7 @@
"associations": "Configure asociaciones de archivo para los lenguajes (por ejemplo, \"*.extension\": \"html\"). Estas asociaciones tienen prioridad sobre las asociaciones predeterminadas de los lenguajes instalados.",
"encoding": "La codificación del juego de caracteres predeterminada que debe utilizarse al leer y escribir archivos.",
"autoGuessEncoding": "Si está opción está habilitada, se intentará adivinar la codificación del juego de caracteres al abrir los archivos",
"eol": "Carácter predeterminado de final de línea. Utilice \\n para LF y \\r\\n para CRLF.",
"trimTrailingWhitespace": "Si se habilita, se recortará el espacio final cuando se guarde un archivo.",
"insertFinalNewline": "Si se habilita, inserte una nueva línea final al final del archivo cuando lo guarde.",
"files.autoSave.off": "Un archivo con modificaciones no se guarda nunca automáticamente.",
......
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -7,7 +7,6 @@
"ok": "OK",
"pathNotExistTitle": "Le chemin d'accès n'existe pas",
"pathNotExistDetail": "Le chemin d'accès '{0}' ne semble plus exister sur le disque.",
"accessibilityOptionsWindowTitle": "Options d'accessibilité",
"reopen": "Rouvrir",
"wait": "Continuer à attendre",
"close": "Fermer",
......
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -4,7 +4,8 @@
*--------------------------------------------------------------------------------------------*/
// Do not edit this file. It is machine generated.
{
"disableOtherKeymapsConfirmation": "Désactiver les autres mappages de touches pour éviter les conflits de combinaisons de touches ?",
"yes": "Oui",
"no": "Non"
"no": "Non",
"uninstall": "Désinstaller",
"later": "Plus tard"
}
\ No newline at end of file
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -7,7 +7,6 @@
"ok": "OK",
"pathNotExistTitle": "Il percorso non esiste",
"pathNotExistDetail": "Il percorso '{0}' sembra non esistere più sul disco.",
"accessibilityOptionsWindowTitle": "Opzioni accessibilità",
"reopen": "Riapri",
"wait": "Continua ad attendere",
"close": "Chiudi",
......
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -4,7 +4,8 @@
*--------------------------------------------------------------------------------------------*/
// Do not edit this file. It is machine generated.
{
"disableOtherKeymapsConfirmation": "Disabilitare altre mappature tastiera per evitare conflitti tra tasti di scelta rapida?",
"yes": "Sì",
"no": "No"
"no": "No",
"uninstall": "Disinstalla",
"later": "In seguito"
}
\ No newline at end of file
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -26,6 +26,9 @@
"provide commit message": "コミット メッセージを入力してください",
"branch name": "ブランチ名",
"provide branch name": "ブランチ名を指定してください",
"select branch to delete": "削除するブランチの選択",
"confirm force delete branch": "ブランチ '{0}' はマージされていません。それでも削除しますか?",
"delete branch": "ブランチの削除",
"no remotes to pull": "リポジトリには、プル元として構成されているリモートがありません。",
"no remotes to push": "リポジトリには、プッシュ先として構成されているリモートがありません。",
"nobranch": "リモートにプッシュするブランチをチェックアウトしてください。",
......
......@@ -26,6 +26,7 @@
"command.undoCommit": "前回のコミットを元に戻す",
"command.checkout": "チェックアウト先...",
"command.branch": "分岐の作成...",
"command.deleteBranch": "ブランチの削除...",
"command.pull": "プル",
"command.pullRebase": "プル (リベース)",
"command.push": "プッシュ",
......
......@@ -3,4 +3,6 @@
* 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
{
"onPreviewStyleLoadError": "'markdown.styles' を読み込むことができません: {0}"
}
\ No newline at end of file
......@@ -3,4 +3,6 @@
* 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
{
"compareChanges": "変更の比較"
}
\ No newline at end of file
......@@ -3,4 +3,8 @@
* 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
{
"cursorNotInConflict": "エディターのカーソルがマージの競合の範囲内にありません",
"noConflicts": "このファイルにマージの競合は存在しません",
"noOtherConflictsInThisFile": "このファイルに他のマージの競合は存在しません"
}
\ No newline at end of file
......@@ -3,4 +3,6 @@
* 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
{
"currentChange": "(現在の変更)"
}
\ No newline at end of file
......@@ -3,4 +3,10 @@
* 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
{
"command.category": "マージの競合",
"command.next": "次の競合",
"command.previous": "前の競合",
"command.compare": "現在の競合を比較",
"config.title": "マージの競合"
}
\ No newline at end of file
......@@ -3,4 +3,6 @@
* 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
{
"config.npm.autoDetect": "npm スクリプトの自動検出をオンにするかオフにするかを制御します。既定はオンです。"
}
\ No newline at end of file
......@@ -37,6 +37,7 @@
"typescript.referencesCodeLens.enabled": "TypeScript ファイル内で CodeLens の参照を有効/無効にします。TypeScript 2.0.6 以上が必要です。",
"typescript.implementationsCodeLens.enabled": "CodeLens の実装を有効/無効にします。TypeScript 2.2.0 以上が必要です。",
"typescript.openTsServerLog.title": "TS サーバーのログを開く",
"typescript.restartTsServer": "TS サーバーを再起動する",
"typescript.selectTypeScriptVersion.title": "TypeScript のバージョンの選択",
"jsDocCompletion.enabled": " 自動 JSDoc コメントを有効/無効にします",
"javascript.implicitProjectConfig.checkJs": "JavaScript ファイルのセマンティック チェックを有効/無効にします。既存の jsconfi.json や tsconfi.json ファイルの設定はこれより優先されます。TypeScript は 2.3.1 以上である必要があります。",
......
......@@ -6,6 +6,7 @@
{
"imgMeta": "{0}x{1} {2}",
"largeImageError": "イメージが大きすぎてエディターに表示できません。",
"resourceOpenExternalButton": "外部のプログラムを使用して画像を開きますか?",
"nativeBinaryError": "このファイルはバイナリか、非常に大きいか、またはサポートされていないテキスト エンコードを使用しているため、エディターに表示されません。",
"sizeB": "{0}B",
"sizeKB": "{0}KB",
......
......@@ -7,7 +7,6 @@
"ok": "OK",
"pathNotExistTitle": "パスが存在しません",
"pathNotExistDetail": "パス '{0}' はディスクに存在しなくなったようです。",
"accessibilityOptionsWindowTitle": "ユーザー補助オプション",
"reopen": "もう一度開く",
"wait": "待機を続ける",
"close": "閉じる",
......
......@@ -16,5 +16,9 @@
"editorBracketMatchBackground": "一致するかっこの背景色",
"editorBracketMatchBorder": "一致するかっこ内のボックスの色",
"editorOverviewRulerBorder": "概要ルーラーの境界色。",
"editorGutter": "エディターの余白の背景色。余白にはグリフ マージンと行番号が含まれます。"
"editorGutter": "エディターの余白の背景色。余白にはグリフ マージンと行番号が含まれます。",
"errorForeground": "エディターでエラーを示す波線の前景色。",
"errorBorder": "エディターでエラーを示す波線の境界線の色。",
"warningForeground": "エディターで警告を示す波線の前景色。",
"warningBorder": "エディターで警告を示す波線の境界線の色。"
}
\ No newline at end of file
......@@ -6,6 +6,7 @@
{
"links.navigate.mac": "command キーを押しながらクリックしてリンク先を表示",
"links.navigate": "Ctrl キーを押しながらクリックしてリンク先を表示",
"links.navigate.al": "Altl キーを押しながらクリックしてリンク先を表示",
"invalid.url": "申し訳ありません。このリンクは形式が正しくないため開くことができませんでした: {0}",
"missing.url": "申し訳ありません。このリンクはターゲットが存在しないため開くことができませんでした。",
"label": "リンクを開く"
......
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -4,5 +4,6 @@
*--------------------------------------------------------------------------------------------*/
// Do not edit this file. It is machine generated.
{
"statusBarDebuggingBackground": "プログラムをデバッグしているときのステータス バーの背景色。ステータス バーはウィンドウの下部に表示されます"
"statusBarDebuggingBackground": "プログラムをデバッグしているときのステータス バーの背景色。ステータス バーはウィンドウの下部に表示されます",
"statusBarDebuggingForeground": "プログラムをデバッグしているときのステータス バーの前景色。ステータス バーはウィンドウの下部に表示されます"
}
\ No newline at end of file
......@@ -22,6 +22,8 @@
"disableGloballyAction": "常に行う",
"disableAction": "無効にする",
"checkForUpdates": "更新の確認",
"enableAutoUpdate": "拡張機能の自動更新を有効にする",
"disableAutoUpdate": "拡張機能の自動更新を無効にする",
"updateAll": "すべての拡張機能を更新します",
"reloadAction": "再読み込み",
"postUpdateTooltip": "再度読み込んで更新する",
......@@ -44,6 +46,8 @@
"showWorkspaceRecommendedExtensions": "ワークスペースのおすすめの拡張機能を表示",
"showRecommendedKeymapExtensions": "推奨のキーマップを表示する",
"showRecommendedKeymapExtensionsShort": "キーマップ",
"showLanguageExtensions": "言語の拡張機能を表示",
"showLanguageExtensionsShort": "言語の拡張機能",
"configureWorkspaceRecommendedExtensions": "お勧めの拡張機能の構成 (ワークスペース)",
"ConfigureWorkspaceRecommendations.noWorkspace": "推奨事項はワークスペース フォルダーでのみ利用可能です。",
"OpenExtensionsFile.failed": "'.vscode' ファルダー ({0}) 内に 'extensions.json' ファイルを作成できません。",
......
......@@ -4,7 +4,8 @@
*--------------------------------------------------------------------------------------------*/
// Do not edit this file. It is machine generated.
{
"disableOtherKeymapsConfirmation": "キーバインド間の競合を回避するために、他のキーマップを無効にしますか?",
"yes": "はい",
"no": "いいえ"
"no": "いいえ",
"uninstall": "アンインストール",
"later": "後続"
}
\ No newline at end of file
......@@ -16,6 +16,7 @@
"associations": "言語に対するファイルの関連付け (例 \"*.extension\": \"html\") を構成します。これらの関連付けは、インストールされている言語の既定の関連付けより優先されます。",
"encoding": "ファイルの読み取り/書き込みで使用する既定の文字セット エンコーディング。",
"autoGuessEncoding": "有効な場合、ファイルを開くときに文字セット エンコードを推測します",
"eol": "既定の改行文字。LF の場合には \\n を CRLF の場合には \\r\\n を使用してください。",
"trimTrailingWhitespace": "有効にすると、ファイルの保存時に末尾の空白をトリミングします。",
"insertFinalNewline": "有効にすると、ファイルの保存時に最新の行を末尾に挿入します。",
"files.autoSave.off": "ダーティ ファイルを自動的に保存することはしません。",
......
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -9,5 +9,6 @@
"vscode.extension.contributes.snippets-path": "スニペット ファイルのパス。拡張機能フォルダーの相対パスであり、通常 './snippets/' で始まります。",
"invalid.language": "`contributes.{0}.language` で不明な言語です。提供された値: {1}",
"invalid.path.0": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
"invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。"
"invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。",
"badVariableUse": "スニペット \"{0}\" は、スニペット変数とスニペット プレースホルダーを混乱させる可能性が非常にあります。詳細については https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax をご覧ください。"
}
\ No newline at end of file
......@@ -7,7 +7,6 @@
"ok": "확인",
"pathNotExistTitle": "경로가 없습니다.",
"pathNotExistDetail": "'{0}' 경로가 디스크에 더 이상 없는 것 같습니다.",
"accessibilityOptionsWindowTitle": "접근성 옵션",
"reopen": "다시 열기",
"wait": "계속 대기",
"close": "닫기",
......
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -4,7 +4,8 @@
*--------------------------------------------------------------------------------------------*/
// Do not edit this file. It is machine generated.
{
"disableOtherKeymapsConfirmation": "키 바인딩 간 충돌을 피하기 위해 다른 키 맵을 사용하지 않도록 설정할까요?",
"yes": "예",
"no": "아니요"
"no": "아니요",
"uninstall": "제거",
"later": "나중에"
}
\ No newline at end of file
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* 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
......@@ -26,6 +26,9 @@
"provide commit message": "Por favor, forneça uma mensagem de commit",
"branch name": "Nome do Ramo",
"provide branch name": "Por favor, forneça um nome de ramo",
"select branch to delete": "Selecione uma ramificação para excluir",
"confirm force delete branch": "A ramificação '{0}' não foi totalmente mesclada. Excluir mesmo assim?",
"delete branch": "Excluir ramificação",
"no remotes to pull": "O seu repositório não possui remotos configurados para efetuar pull.",
"no remotes to push": "O seu repositório não possui remotos configurados para efetuar push.",
"nobranch": "Por favor, faça checkout em um ramo para fazer push em um remoto.",
......
......@@ -26,6 +26,7 @@
"command.undoCommit": "Desfazer Ultima Confirmação",
"command.checkout": "Fazer checkout para...",
"command.branch": "Criar Ramificação...",
"command.deleteBranch": "Excluir Ramificação...",
"command.pull": "Efetuar pull",
"command.pullRebase": "Efetuar pull (Rebase)",
"command.push": "Enviar por push",
......
......@@ -3,4 +3,6 @@
* 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
{
"onPreviewStyleLoadError": "Não foi possível carregar o 'markdown.styles': {0}"
}
\ No newline at end of file
......@@ -3,4 +3,9 @@
* 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
{
"acceptCurrentChange": "Aceitar a mudança atual",
"acceptIncomingChange": "Aceitar a mudança de entrada",
"acceptBothChanges": "Aceitar ambas alterações",
"compareChanges": "Comparar alteracões"
}
\ No newline at end of file
......@@ -3,4 +3,10 @@
* 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
{
"cursorNotInConflict": "Cursor do editor não está dentro de um conflito de mesclagem",
"compareChangesTitle": "{0}: Mudanças atuais \\u2194 alterações de entrada ",
"cursorOnSplitterRange": "Cursor do editor está dentro do separador de conflitos de mesclagem, por favor mova-o para o bloco \"atual\" ou \"entrada\"",
"noConflicts": "Nenhum conflito de mesclagem encontrado neste arquivo",
"noOtherConflictsInThisFile": "Não há outros conflitos de mesclagem dentro desse arquivo"
}
\ No newline at end of file
......@@ -3,4 +3,7 @@
* 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
{
"currentChange": "(Mudança atual)",
"incomingChange": "(Mudança de entrada)"
}
\ No newline at end of file
......@@ -3,4 +3,18 @@
* 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
{
"command.category": "Conflito de Mesclagem",
"command.accept.all-incoming": "Aceitar todas as novas entradas",
"command.accept.all-both": "Aceitar Ambos",
"command.accept.current": "Aceitar a atual",
"command.accept.incoming": "Aceitar as novas entradas",
"command.accept.selection": "Aceitar a seleção",
"command.accept.both": "Aceitar Ambos",
"command.next": "Próximo conflito",
"command.previous": "Conflito anterior",
"command.compare": "Comparar o conflito atual",
"config.title": "Mesclar conflitos",
"config.codeLensEnabled": "Habilitar/Desabilitar o conflito de mesclagem no bloco CodeLens dentro do editor",
"config.decoratorsEnabled": "Habilitar/Desabilitar decoradores de mesclagem de conflitos dentro do editor"
}
\ No newline at end of file
......@@ -3,4 +3,6 @@
* 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
{
"config.npm.autoDetect": "Controla se a deteção automática de scripts npm está ligado ou desligado. O padrão é ligado."
}
\ No newline at end of file
......@@ -37,6 +37,7 @@
"typescript.referencesCodeLens.enabled": "Habilitar/desabilitar referências CodeLens em arquivos TypeScript. Requer TypeScript > = 2.0.6.",
"typescript.implementationsCodeLens.enabled": "Habilitar/desabilitar implementações CodeLens. Requer TypeScript > = 2.0.6.",
"typescript.openTsServerLog.title": "Abrir arquivo de log do servidor TS",
"typescript.restartTsServer": "Reiniciar o servidor TS",
"typescript.selectTypeScriptVersion.title": "Selecionar a versão do JavaScript",
"jsDocCompletion.enabled": "Habilitar/Desabilitar comentários JSDoc automáticos.",
"javascript.implicitProjectConfig.checkJs": "Habilitar/desabilitar verificação semântica de arquivos JavaScript. Os arquivos existentes jsconfig.json ou tsconfig.json substituem essa configuração. Requer TypeScript > = 2.3.1.",
......
......@@ -6,6 +6,7 @@
{
"imgMeta": "{0}x{1} {2}",
"largeImageError": "A imagem é muito grande para ser exibida no editor.",
"resourceOpenExternalButton": "Abrir imagem usando um programa externo?",
"nativeBinaryError": "O arquivo não pode ser exibido no editor porque é binário, muito grande ou usa uma codificação de texto sem suporte.",
"sizeB": "{0}B",
"sizeKB": "{0}KB",
......
......@@ -7,7 +7,6 @@
"ok": "OK",
"pathNotExistTitle": "O caminho não existe",
"pathNotExistDetail": "O caminho '{0}' não parece mais existir no disco.",
"accessibilityOptionsWindowTitle": "Opções de Acessibilidade",
"reopen": "Reabrir",
"wait": "Continuar Esperando",
"close": "Fechar",
......
......@@ -23,6 +23,8 @@
"minimap.enabled": "Controla se o mini mapa é exibido",
"minimap.renderCharacters": "Renderizar os caracteres em uma linha (em oposição a blocos de caracteres)",
"minimap.maxColumn": "Limitar o tamanho de um mini-mapa para renderizar no máximo um número determinado de colunas",
"find.seedSearchStringFromSelection": "Controla se nós inicializamos a string de pesquisa na Ferramenta de Pesquisa a partir da seleção do editor",
"find.autoFindInSelection": "Controla se a configuração Find in Selection deve estar ativada quando vários caracteres ou linhas de texto estão selecionados no editor",
"wordWrap.off": "As linhas nunca serão quebradas.",
"wordWrap.on": "As linhas serão quebradas na largura de visualização",
"wordWrap.wordWrapColumn": "As linhas serão quebradas em `editor.wordWrapColumn`.",
......@@ -31,6 +33,7 @@
"wordWrapColumn": "Controla a coluna de quebra de linha do editor quando editor.wordWrap` é 'wordWrapColumn' ou 'bounded'.",
"wrappingIndent": "Controla o recuo de linhas quebradas. Pode ser \"none\", \"same\" ou \"indent\".",
"mouseWheelScrollSensitivity": "Um multiplicador a ser usado em \"deltaX\" e \"deltaY\" dos eventos de rolagem do botão de rolagem do mouse",
"multicursorModifier": "O modificador a ser utilizado para adicionar vários cursores com o mouse.",
"quickSuggestions.strings": "Habilitar sugestões rápidas dentro de strings.",
"quickSuggestions.comments": "Habilitar sugestões rápidas dentro de comentários.",
"quickSuggestions.other": "Habilitar sugestões rápidas fora de strings e comentários.",
......@@ -41,6 +44,7 @@
"formatOnType": "Controla se o editor deve formatar automaticamente a linha após a digitação",
"formatOnPaste": "Controla se o editor deve formatar automaticamente o conteúdo colado. Um formatador deve estar disponível e o formatador deve ser capaz de formatar apenas uma parte do documento.",
"suggestOnTriggerCharacters": "Controla se as sugestões devem aparecer automaticamente ao digitar caracteres de gatilho",
"acceptSuggestionOnEnter": "Controla se as sugestões devem ser aceitas com 'Enter' - em adição a 'Tab'. Ajuda a evitar a ambiguidade entre a inserção de novas linhas ou aceitar sugestões. O valor 'smart' significa apenas aceitar uma sugestão com Enter quando ela fizer uma mudança textual",
"acceptSuggestionOnCommitCharacter": "Controla se as sugestões devem ser aceitas em caracteres de confirmação. Por exemplo, em JavaScript, o ponto-e-vírgula (';') pode ser um caractere de confirmação que aceita uma sugestão e digita esse caractere.",
"snippetSuggestions": "Controla se os snippets são exibidos juntamente com as outras sugestões e como eles são ordenados.",
"emptySelectionClipboard": "Controla se a cópia sem nenhuma seleção copia a linha atual.",
......
......@@ -16,5 +16,9 @@
"editorBracketMatchBackground": "Cor de fundo atrás do colchetes correspondentes",
"editorBracketMatchBorder": "Cor para as caixas de colchetes correspondentes",
"editorOverviewRulerBorder": "Cor da borda da régua de visão geral.",
"editorGutter": "Cor de fundo da separação do editor.O separador contém os glifos das margens e os números de linha."
"editorGutter": "Cor de fundo da separação do editor.O separador contém os glifos das margens e os números de linha.",
"errorForeground": "Cor do primeiro plano das linhas onduladas de erro no editor.",
"errorBorder": "Cor da borda das linhas onduladas de erro no editor.",
"warningForeground": "Cor do primeiro plano de linhas onduladas de aviso no editor.",
"warningBorder": "Cor da borda das linhas onduladas de aviso no editor."
}
\ No newline at end of file
......@@ -6,6 +6,7 @@
{
"links.navigate.mac": "Cmd + clique para seguir o link",
"links.navigate": "Ctrl + clique para seguir o link",
"links.navigate.al": "Alt + clique para seguir o link",
"invalid.url": "Desculpe, falha ao abrir este link porque ele não está bem formatado: {0}",
"missing.url": "Desculpe, falha ao abrir este link porque seu destino está faltando.",
"label": "Abrir link"
......
......@@ -11,6 +11,7 @@
"endOfLineLineFeed": "LF",
"endOfLineCarriageReturnLineFeed": "CRLF",
"tabFocusModeEnabled": "Tabulação move o foco",
"screenReaderDetected": "Leitor de tela detectado",
"disableTabMode": "Desativar o modo de acessibilidade",
"gotoLine": "Ir para linha",
"indentation": "Indentação",
......
......@@ -11,6 +11,7 @@
"tabInactiveEditorGroupActiveForeground": "Cor de primeiro plano da guia inativa em um grupo ativo. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.",
"editorGroupBackground": "Cor de fundo de um grupo de editor. Grupos de editor são os recipientes dos editores. A cor de fundo é mostrada ao arrastar o editor de grupos ao redor.",
"tabsContainerBackground": "Cor de fundo do cabeçalho do título do grupo de editor quando as guias são habilitadas. Grupos de editor são os recipientes dos editores.",
"tabsContainerBorder": "Cor da borda do cabeçalho do título do grupo de editor quando as guias estão habilitadas. Grupos de editor são os recipientes dos editores.",
"editorGroupHeaderBackground": "Cor de fundo do título do cabeçalho do grupo de editor quando as guias são desabilitadas. Grupos de editor são os recipientes dos editores.",
"editorGroupBorder": "Cor para separar múltiplos grupos de editor de outro. Grupos de editor são os recipientes dos editores.",
"editorDragAndDropBackground": "Cor de fundo ao arrastar editores. A cor deve ter transparência para que o conteúdo do editor ainda possa ser visto.",
......@@ -21,20 +22,25 @@
"panelActiveTitleBorder": "Cor da borda para o título do painel ativo. Os painéis são mostrados abaixo da área do editor e contém visualizações como saída e terminal integrado.",
"statusBarForeground": "Cor do primeiro plano da barra de status. A barra de status é mostrada na parte inferior da janela.",
"statusBarBackground": "Cor de fundo da barra de status padrão. A barra de status é mostrada na parte inferior da janela.",
"statusBarBorder": "Cor da borda da barra de status que separa a barra lateral e o editor.A barra de status é mostrada na parte inferior da janela.",
"statusBarNoFolderBackground": "Cor de fundo da barra de status quando nenhuma pasta está aberta. A barra de status é mostrada na parte inferior da janela.",
"statusBarNoFolderForeground": "Cor do primeiro plano da barra de status quando nenhuma pasta está aberta. A barra de status é mostrada na parte inferior da janela.",
"statusBarItemActiveBackground": "Cor de fundo do item da barra de status quando você clicado. A barra de status é mostrada na parte inferior da janela.",
"statusBarItemHoverBackground": "Cor de fundo do item da barra de status quando estiver passando sobre ele. A barra de status é mostrada na parte inferior da janela.",
"statusBarProminentItemBackground": "Cor de fundo de itens proeminentes da barra de status. Itens proeminentes destacam-se outras entradas da barra de status para indicar a importância. A barra de status é mostrada na parte inferior da janela.",
"statusBarProminentItemHoverBackground": "Cor de fundo dos itens proeminentes de barra de status quando estiver passando sobre eles. Itens proeminentes destacam-se outras entradas de barra de status para indicar a importância. A barra de status é mostrada na parte inferior da janela.",
"activityBarBackground": "Cor de fundo da barra de atividades. Barra de atividade está visível à esquerda ou à direita e permite alternar entre as visualizações da barra lateral.",
"activityBarForeground": "Cor de primeiro plano da barra de atividades (por exemplo, usada para os ícones). A barra de atividades está visível à esquerda ou à direita e permite alternar entre as visualizações da barra lateral.",
"activityBarBorder": "Cor da borda da barra de atividades separando a barra lateral. A barra de atividade é mostrada à esquerda ou à direita e permite alternar entre as visualizações da barra lateral.",
"activityBarDragAndDropBackground": "Cor de feedback de arrastar e soltar para os itens da barra de atividades. A cor deve ter transparência para que as entradas de bar de atividade ainda possam brilhar. A barra de atividade está visível à esquerda ou à direita e permite para alternar entre as visualizações da barra lateral.",
"activityBarBadgeBackground": "Cor de fundo da notificação de atividade. A barra de atividade está visível à esquerda ou à direita e permite alternar entre as visualizações da barra lateral.",
"activityBarBadgeForeground": "Cor de primeiro plano da notificação de atividade. A barra de atividade está visível à esquerda ou à direita e permite alternar entre as visualizações da barra lateral.",
"sideBarBackground": "Cor de fundo da barra lateral. A barra lateral é o recipiente para visualizações como explorador e pesquisa.",
"sideBarForeground": "Cor de primeiro plano da barra lateral. A barra lateral é o recipiente para visualizações como o explorador e a busca.",
"sideBarBorder": "Cor da borda da barra lateral separando o editor. A barra lateral é o recipiente para visualizações como explorador e pesquisa.",
"sideBarTitleForeground": "Cor de primeiro plano do título da barra lateral. A barra lateral é o recipiente para visualizações como explorador e pesquisa.",
"sideBarSectionHeaderBackground": "Cor de fundo do cabeçalho de seção lateral. A barra lateral é o recipiente para visões como explorador e pesquisa.",
"sideBarSectionHeaderForeground": "Cor de primeiro plano do cabeçalho de seção da barra lateral. A barra lateral é o recipiente para visualizações como o explorador e pesquisa.",
"titleBarActiveForeground": "Cor da barra de título do primeiro plano quando a janela está ativa. Observe que essa cor atualmente somente é suportada no macOS.",
"titleBarInactiveForeground": "Cor de primeiro plano da barra de título quando a janela está inativa. Observe que essa cor atualmente somente é suportada no macOS.",
"titleBarActiveBackground": "Cor de fundo da barra de título quando a janela está ativa. Observe que essa cor atualmente somente é suportada no macOS.",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册