diff options
author | Sandeep Somavarapu <sasomava@microsoft.com> | 2018-03-07 11:10:01 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-07 11:10:01 +0300 |
commit | 9a199d77c82fcb82f39c68bb33c614af01c111ba (patch) | |
tree | faa0cfa1e2a61ed5d7ddeab3e29a2d1e395d49ee /i18n/jpn/extensions/merge-conflict/package.i18n.json | |
parent | a903bd38fbe9006c076d218ff69fe1ee0160f815 (diff) | |
parent | 3bdf5c8aadb2c154580805ebd477fe70f5507d23 (diff) |
Merge pull request #45167 from Microsoft/loc/1.211.21.0
2018-03-06. Merged in translations from Transifex.
Diffstat (limited to 'i18n/jpn/extensions/merge-conflict/package.i18n.json')
-rw-r--r-- | i18n/jpn/extensions/merge-conflict/package.i18n.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/i18n/jpn/extensions/merge-conflict/package.i18n.json b/i18n/jpn/extensions/merge-conflict/package.i18n.json index ae1af61b50b..a21287ee929 100644 --- a/i18n/jpn/extensions/merge-conflict/package.i18n.json +++ b/i18n/jpn/extensions/merge-conflict/package.i18n.json @@ -7,7 +7,7 @@ "Do not edit this file. It is machine generated." ], "displayName": "マージの競合", - "description": "行内マージ競合のカラーリングとコマンド。", + "description": "行内マージ競合のハイライト、コマンドを提供します。", "command.category": "マージの競合", "command.accept.all-current": "現在の方をすべて取り込む", "command.accept.all-incoming": "入力側のすべてを取り込む", |