From a97162fb0467bd2b8923afdd6899e48b3f66dcf3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 12 Jul 2019 05:13:22 +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 8ef3251..14760cb 100644
--- a/src/util/org.kde.kpmcore.externalcommand.actions
+++ b/src/util/org.kde.kpmcore.externalcommand.actions
@@ -46,6 +46,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[sk]=Práva správcu sú potrebné na správu diskov
 Description[sv]=Administratörsprivilegier krävs för att hantera diskar
 Description[uk]=Для керування дисками потрібні права доступу адміністратора (root)
 Description[x-test]=xxAdministrative privileges are required to manage disksxx