From efb56a365b32a59f60b33b5ca090d00a48fe3a51 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 12 Feb 2018 05:18:27 +0100
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/org.kde.kmail2.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/data/org.kde.kmail2.desktop b/src/data/org.kde.kmail2.desktop
index 8f637f829..26fb7f17b 100755
--- a/src/data/org.kde.kmail2.desktop
+++ b/src/data/org.kde.kmail2.desktop
@@ -201,6 +201,7 @@ Name=New Message...
 Name[ar]=رسالة جديدة...
 Name[ca]=Missatge nou...
 Name[ca@valencia]=Missatge nou...
+Name[de]=Neue Nachricht ...
 Name[es]=Nuevo mensaje...
 Name[fi]=Uusi viesti…
 Name[fr]=Nouveau message...