From 3c52bcf9ab9adc56fa2f4cd30586720b79511c63 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 21 Oct 2018 05:48:52 +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 dd8d677..7590e14 100644
--- a/src/util/org.kde.kpmcore.externalcommand.actions
+++ b/src/util/org.kde.kpmcore.externalcommand.actions
@@ -11,6 +11,7 @@ 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[gl]=Iniciar o servizo de orde externa
 Name[ko]=외부 명령 데몬 시작
 Name[lt]=Paleisti išorinių komandų tarnybą
 Name[nl]=Start externe opdrachtdaemon
@@ -29,6 +30,7 @@ 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[gl]=Requírense privilexios de administración para xestionar discos.
 Description[ko]=디스크를 관리하려면 권한이 필요함
 Description[lt]=Diskų tvarkymui reikalingos administratoriaus teisės
 Description[nl]=Er zijn administratieve rechten vereist om schijven te beheren