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/rus/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/rus/extensions/merge-conflict/package.i18n.json')
| -rw-r--r-- | i18n/rus/extensions/merge-conflict/package.i18n.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/i18n/rus/extensions/merge-conflict/package.i18n.json b/i18n/rus/extensions/merge-conflict/package.i18n.json index bd6f7189d8c..617fa5e579f 100644 --- a/i18n/rus/extensions/merge-conflict/package.i18n.json +++ b/i18n/rus/extensions/merge-conflict/package.i18n.json @@ -7,6 +7,7 @@ "Do not edit this file. It is machine generated." ], "displayName": "Объединить конфликт", + "description": "Выделение и команды для внутренних конфликтов слияния.", "command.category": "Объединить конфликт", "command.accept.all-current": "Принять все текущие", "command.accept.all-incoming": "Принять все входящие", |