mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-24 05:40:29 -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
24 lines
1.2 KiB
JSON
24 lines
1.2 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": "Mesclar conflitos",
|
|
"command.category": "Conflito de Mesclagem",
|
|
"command.accept.all-current": "Aceitar Todos os Atuais",
|
|
"command.accept.all-incoming": "Aceitar todas entradas",
|
|
"command.accept.all-both": "Aceitar todas as duas",
|
|
"command.accept.current": "Aceitar a corrente",
|
|
"command.accept.incoming": "Aceitar entrada",
|
|
"command.accept.selection": "Aceitar a seleção",
|
|
"command.accept.both": "Aceitar Ambos",
|
|
"command.next": "Próximo conflito",
|
|
"command.previous": "Conflito anterior",
|
|
"command.compare": "Comparar o conflito atual",
|
|
"config.title": "Mesclar conflitos",
|
|
"config.codeLensEnabled": "Habilitar/Desabilitar o conflito de mesclagem no bloco CodeLens dentro do editor",
|
|
"config.decoratorsEnabled": "Habilitar/Desabilitar decoradores de mesclagem de conflitos dentro do editor"
|
|
} |