/*---------------------------------------------------------------------------------------------
 *  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": "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"
}