From f8cdf99606ddf7eabcc65d76fc3275a51bfda0a1 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 24 Aug 2018 05:42:47 +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 | 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 c92ee09..7c8fbdd 100644
--- a/src/util/org.kde.kpmcore.externalcommand.actions
+++ b/src/util/org.kde.kpmcore.externalcommand.actions
@@ -9,6 +9,7 @@ Name[cs]=Spustit démona externích příkazů
 Name[en_GB]=Start external command daemon
 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[ko]=외부 명령 데몬 시작
 Name[lt]=Paleisti išorinių komandų tarnybą
 Name[nl]=Start externe opdrachtdaemon
@@ -24,6 +25,7 @@ Description[cs]=Pro správu disků jsou potřeba práva administrátora
 Description[en_GB]=Administrative privileges are required to manage disks
 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[ko]=디스크를 관리하려면 권한이 필요함
 Description[lt]=Diskų tvarkymui reikalingos administratoriaus teisės
 Description[nl]=Er zijn administratieve rechten vereist om schijven te beheren