Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
83fd45c4
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
83fd45c4
编写于
5月 22, 2017
作者:
P
Phil Price
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Command titles and category localization support
上级
61f16319
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
17 deletion
+27
-17
extensions/merge-conflict/package.json
extensions/merge-conflict/package.json
+17
-17
extensions/merge-conflict/package.nls.json
extensions/merge-conflict/package.nls.json
+10
-0
未找到文件。
extensions/merge-conflict/package.json
浏览文件 @
83fd45c4
...
...
@@ -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"
}
],
...
...
extensions/merge-conflict/package.nls.json
浏览文件 @
83fd45c4
{
"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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录