From 1a4dc1f03a60fc75a02133e93487e7d42926894e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 29 Jan 2018 05:05:42 +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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/data/org.kde.kmail2.desktop b/src/data/org.kde.kmail2.desktop
index 6bd561e0d..87fecf287 100755
--- a/src/data/org.kde.kmail2.desktop
+++ b/src/data/org.kde.kmail2.desktop
@@ -199,8 +199,10 @@ Actions=Composer;CheckMail;
 Name=New Message...
 Name[ca]=Missatge nou...
 Name[ca@valencia]=Missatge nou...
+Name[es]=Nuevo mensaje...
 Name[it]=Nuovo messaggio...
 Name[nl]=Nieuw bericht...
+Name[pl]=Nowa wiadomość...
 Name[pt]=Nova Mensagem...
 Name[sl]=Novo sporočilo ...
 Name[sv]=Nytt brev...