From 625089cd44c02a81e86d77199ed41b7bf12b9c48 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 12 Jan 2016 12:10:42 +0000
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"
---
 runners/baloo/plasma-runner-baloosearch.desktop | 2 +-
 xembed-sni-proxy/xembedsniproxy.desktop         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/runners/baloo/plasma-runner-baloosearch.desktop b/runners/baloo/plasma-runner-baloosearch.desktop
index b5378241f..ff985788e 100644
--- a/runners/baloo/plasma-runner-baloosearch.desktop
+++ b/runners/baloo/plasma-runner-baloosearch.desktop
@@ -48,7 +48,7 @@ Comment[ca]=Executor que cerca per fitxers, correus electrònics i contactes
 Comment[ca@valencia]=Executor que cerca per fitxers, correus electrònics i contactes
 Comment[cs]=Spouštěč, který prohledává v souborech, emailech a kontaktech
 Comment[da]=Runner som gennemsøger filer, e-mails og kontakter
-Comment[de]=Runner, der Dateiene, E-Mails und Kontakte durchsucht
+Comment[de]=Runner, der Dateien, E-Mails und Kontakte durchsucht
 Comment[el]=Εκτελεστής που εκτελεί αναζήτηση σε αρχεία, μηνύματα ηλ. ταχυδρομείου και επαφές
 Comment[en_GB]=Runner which searches through files, emails and contacts
 Comment[es]=Lanzador que busca en archivos, correo electrónico y contactos
diff --git a/xembed-sni-proxy/xembedsniproxy.desktop b/xembed-sni-proxy/xembedsniproxy.desktop
index 2c7afd85e..202406cd9 100644
--- a/xembed-sni-proxy/xembedsniproxy.desktop
+++ b/xembed-sni-proxy/xembedsniproxy.desktop
@@ -5,6 +5,7 @@ Name[ast]=XembedSniProxy
 Name[ca]=XembedSniProxy
 Name[ca@valencia]=XembedSniProxy
 Name[da]=XembedSniProxy
+Name[de]=XembedSniProxy
 Name[en_GB]=XembedSniProxy
 Name[es]=XembedSniProxy
 Name[et]=XembedSniProxy