From b22be9ad9a39fb423509eda5948b6280558f1f7c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 21 Nov 2018 05:40:59 +0100
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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/util/org.kde.kpmcore.externalcommand.actions b/src/util/org.kde.kpmcore.externalcommand.actions
index bba0030..28c4c7d 100644
--- a/src/util/org.kde.kpmcore.externalcommand.actions
+++ b/src/util/org.kde.kpmcore.externalcommand.actions
@@ -12,6 +12,7 @@ Name[es]=Iniciar el demonio de órdenes externas
 Name[fi]=Käynnistä ulkoinen komentopalvelu
 Name[fr]=Lancer le démon de la commande externe
 Name[gl]=Iniciar o servizo de orde externa
+Name[it]=Avvia demone per comando esterno
 Name[ko]=외부 명령 데몬 시작
 Name[lt]=Paleisti išorinių komandų tarnybą
 Name[nl]=Start externe opdrachtdaemon
@@ -31,6 +32,7 @@ Description[es]=Se necesitan permisos de administrador para gestionar discos
 Description[fi]=Levyjen hallinta vaatii pääkäyttäjäoikeuksia
 Description[fr]=Vous devez disposer des privilèges d'administrateur pour gérer les disques
 Description[gl]=Requírense privilexios de administración para xestionar discos.
+Description[it]=Per gestire il disco sono richiesti privilegi di amministratore
 Description[ko]=디스크를 관리하려면 권한이 필요함
 Description[lt]=Diskų tvarkymui reikalingos administratoriaus teisės
 Description[nl]=Er zijn administratieve rechten vereist om schijven te beheren