From 3c6ee043f6e98767ea7286182d1e4be7d9a2426f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 9 May 2020 06:34:55 +0200
Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve
 ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 src/util/org.kde.kpmcore.externalcommand.actions | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/util/org.kde.kpmcore.externalcommand.actions b/src/util/org.kde.kpmcore.externalcommand.actions
index c4480c4..586e55a 100644
--- a/src/util/org.kde.kpmcore.externalcommand.actions
+++ b/src/util/org.kde.kpmcore.externalcommand.actions
@@ -53,6 +53,7 @@ Description[nl]=Er zijn administratieve rechten vereist om schijven te beheren
 Description[pl]=Do zarządzania dyskami wymagane są uprawnienia administratora
 Description[pt]=São necessários privilégios de administrador para gerir os discos
 Description[pt_BR]=São necessários privilégios administrativos para gerenciar discos
+Description[ru]=Для управления дисками требуются права администратора
 Description[sk]=Na správu diskov sa vyžadujú práva správcu
 Description[sl]=Za upravljanje diskov so potrebne pravice upravljavca računalnika
 Description[sv]=Administratörsprivilegier krävs för att hantera diskar