mirror of
https://github.com/microsoft/vscode.git
synced 2026-05-03 06:51:53 +01:00
20 lines
1.2 KiB
JSON
20 lines
1.2 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": "マージの競合",
|
|
"command.accept.all-incoming": "入力側のすべてを取り込む",
|
|
"command.accept.all-both": "両方をすべて取り込む",
|
|
"command.accept.current": "現在の方を取り込む",
|
|
"command.accept.incoming": "入力側を取り込む",
|
|
"command.accept.selection": "選択項目を取り込む",
|
|
"command.accept.both": "両方を取り込む",
|
|
"command.next": "次の競合",
|
|
"command.previous": "前の競合",
|
|
"command.compare": "現在の競合を比較",
|
|
"config.title": "マージの競合",
|
|
"config.codeLensEnabled": "エディター内のマージ競合ブロックで CodeLens を有効/無効にします",
|
|
"config.decoratorsEnabled": "エディター内でマージの競合デコレーターを有効/無効にします。"
|
|
} |