提交 83fd45c4 编写于 作者: P Phil Price

Command titles and category localization support

上级 61f16319
......@@ -23,48 +23,48 @@
"contributes": {
"commands": [
{
"category": "Merge Conflict",
"title": "Accept all incoming",
"category": "%command.category%",
"title": "%command.accept.all-incoming%",
"command": "merge-conflict.accept.all-incoming"
},
{
"category": "Merge Conflict",
"title": "Accept all both",
"category": "%command.category%",
"title": "%command.accept.all-both%",
"command": "merge-conflict.accept.all-both"
},
{
"category": "Merge Conflict",
"title": "Accept current",
"category": "%command.category%",
"title": "%command.accept.current%",
"command": "merge-conflict.accept.current"
},
{
"category": "Merge Conflict",
"title": "Accept incoming",
"category": "%command.category%",
"title": "%command.accept.incoming%",
"command": "merge-conflict.accept.incoming"
},
{
"category": "Merge Conflict",
"category": "%command.category%",
"title": "Accept selection",
"command": "merge-conflict.accept.selection"
},
{
"category": "Merge Conflict",
"title": "Accept both",
"category": "%command.category%",
"title": "%command.accept.both%",
"command": "merge-conflict.accept.both"
},
{
"category": "Merge Conflict",
"title": "Next conflict",
"category": "%command.category%",
"title": "%command.next%",
"command": "merge-conflict.next"
},
{
"category": "Merge Conflict",
"title": "Previous conflict",
"category": "%command.category%",
"title": "%command.previous%",
"command": "merge-conflict.previous"
},
{
"category": "Merge Conflict",
"title": "Compare current conflict",
"category": "%command.category%",
"title": "%command.compare%",
"command": "merge-conflict.compare"
}
],
......
{
"command.category": "Merge Conflict",
"command.accept.all-incoming": "Accept all incoming",
"command.accept.all-both": "Accept all both",
"command.accept.current": "Accept current",
"command.accept.incoming": "Accept incoming",
"command.accept.selection": "Accept selection",
"command.accept.both": "Accept Both",
"command.next": "Next conflict",
"command.previous": "Previous conflict",
"command.compare": "Compare current conflict",
"config.enabled": "Whether merge conflict editor decorations and code lenses are enabled"
}
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册