Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/vscode.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'i18n/rus/extensions/merge-conflict/package.i18n.json')
-rw-r--r--i18n/rus/extensions/merge-conflict/package.i18n.json1
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": "Принять все входящие",