From f868d0f78ed2f6553e7c8a4a1880b9b2e668d7d8 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 28 Sep 2016 09:22:53 +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"
---
 src/data/kmail_config_plugins.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/data/kmail_config_plugins.desktop b/src/data/kmail_config_plugins.desktop
index ce8680ad2..fef6eaa1d 100644
--- a/src/data/kmail_config_plugins.desktop
+++ b/src/data/kmail_config_plugins.desktop
@@ -86,6 +86,7 @@ Name[zh_TW]=外掛程式
 Comment=Settings Plugins
 Comment[ca]=Arranjament dels connectors
 Comment[ca@valencia]=Arranjament dels connectors
+Comment[de]=Einstellungsmodul
 Comment[en_GB]=Settings Plugins
 Comment[es]=Preferencias de complementos
 Comment[et]=Seadistusplugin