From 310a2e2d2dd652b4da302f9ef54a2bc579951c92 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 6 Aug 2019 04:49:17 +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/scripts/runaction/metadata.desktop | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop
index 57653274b..eba131980 100644
--- a/src/scripts/runaction/metadata.desktop
+++ b/src/scripts/runaction/metadata.desktop
@@ -4,6 +4,7 @@ Name[ca]=Executa una acció
 Name[ca@valencia]=Executa una acció
 Name[cs]=Spustit činnost
 Name[da]=Kør handling
+Name[de]=Aktion ausführen
 Name[en_GB]=Run Action
 Name[es]=Ejecutar acción
 Name[fi]=Suorita toiminto
@@ -28,6 +29,7 @@ Comment[ca]=Executa diverses accions als llocs
 Comment[ca@valencia]=Executa diverses accions als llocs
 Comment[cs]=Spouštět různé činnosti na stránkách
 Comment[da]=Kør diverse handlinger på steder
+Comment[de]=Verschiedene Aktionen auf Webseiten ausführen
 Comment[en_GB]=Run various actions on sites
 Comment[es]=Ejecutar varias acciones en sitios
 Comment[fi]=Suorita eri toimintoja sivustoilla