mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-20 03:51:40 -04:00
dafb780987
* Initial VS Code 1.21 file copy with patches * A few more merges * Post npm install * Fix batch of build breaks * Fix more build breaks * Fix more build errors * Fix more build breaks * Runtime fixes 1 * Get connection dialog working with some todos * Fix a few packaging issues * Copy several node_modules to package build to fix loader issues * Fix breaks from master * A few more fixes * Make tests pass * First pass of license header updates * Second pass of license header updates * Fix restore dialog issues * Remove add additional themes menu items * fix select box issues where the list doesn't show up * formatting * Fix editor dispose issue * Copy over node modules to correct location on all platforms
25 lines
1.3 KiB
JSON
25 lines
1.3 KiB
JSON
{
|
|
"": [
|
|
"--------------------------------------------------------------------------------------------",
|
|
"Copyright (c) Microsoft Corporation. All rights reserved.",
|
|
"Licensed under the Source EULA. See License.txt in the project root for license information.",
|
|
"--------------------------------------------------------------------------------------------",
|
|
"Do not edit this file. It is machine generated."
|
|
],
|
|
"displayName": "Fusionar conflicto",
|
|
"description": "Resaltado y comandos para conflictos de fusión insertada.",
|
|
"command.category": "Fusionar conflicto",
|
|
"command.accept.all-current": "Aceptar todo actual",
|
|
"command.accept.all-incoming": "Aceptar todos los entrantes",
|
|
"command.accept.all-both": "Aceptar ambos",
|
|
"command.accept.current": "Aceptar actuales",
|
|
"command.accept.incoming": "Aceptar entrantes",
|
|
"command.accept.selection": "Aceptar selección",
|
|
"command.accept.both": "Aceptar ambos",
|
|
"command.next": "Siguiente conflicto",
|
|
"command.previous": "Conflicto anterior",
|
|
"command.compare": "Comparar conflicto actual",
|
|
"config.title": "Fusionar conflicto",
|
|
"config.codeLensEnabled": "Habilitar/deshabilitar CodeLens de fusionar bloque de conflictos en el editor",
|
|
"config.decoratorsEnabled": "Habilitar/deshabilitar decoradores de conflictos de fusión en el editor"
|
|
} |