mirror of
https://github.com/microsoft/vscode.git
synced 2026-05-03 23:06:49 +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": "Merge-Konflikt",
|
|
"command.accept.all-incoming": "Alle eingehenden akzeptieren",
|
|
"command.accept.all-both": "Alle beide akzeptieren",
|
|
"command.accept.current": "Aktuelles akzeptieren",
|
|
"command.accept.incoming": "Eingehendes akzeptieren",
|
|
"command.accept.selection": "Auswahl akzeptieren",
|
|
"command.accept.both": "Beides akzeptieren",
|
|
"command.next": "Nächster Konflikt",
|
|
"command.previous": "Vorheriger Konflikt",
|
|
"command.compare": "Aktuellen Konflikt vergleichen",
|
|
"config.title": "Merge-Konflikt",
|
|
"config.codeLensEnabled": "CodeLens-Mergingkonfliktblock im Editor aktivieren/deaktivieren",
|
|
"config.decoratorsEnabled": "Mergingkonflikt-Decorators im Editor aktivieren/deaktivieren"
|
|
} |