From 7967713a3ebe0292e8a1ad51cc1edf83d28a3e64 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 4 Apr 2018 07:18:58 +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/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 00063b113..f93d6a2cc 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[cs]=Nová zpráva...
 Name[de]=Neue Nachricht ...
 Name[en_GB]=New Message...
 Name[es]=Nuevo mensaje...