mirror of
https://github.com/microsoft/vscode.git
synced 2026-05-01 22:12:26 +01:00
20 lines
1.1 KiB
JSON
20 lines
1.1 KiB
JSON
/*---------------------------------------------------------------------------------------------
|
|
* 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.
|
|
{
|
|
"command.category": "Conflito de Mesclagem",
|
|
"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"
|
|
} |