From 0cb461fc1973d11c9d1b1bf257f47ab5443f0a4e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 22 Jan 2018 04:57:30 +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 dbed8b7ed..a241f2c0d 100755
--- a/src/data/org.kde.kmail2.desktop
+++ b/src/data/org.kde.kmail2.desktop
@@ -198,6 +198,7 @@ Actions=Composer;CheckMail;
 [Desktop Action Composer]
 Name=New Message...
 Name[ca]=Missatge nou...
+Name[ca@valencia]=Missatge nou...
 Name[nl]=Nieuw bericht...
 Name[pt]=Nova Mensagem...
 Name[sl]=Novo sporočilo ...