From b91e623316c443e2e82182454efaa96bc43b0040 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 24 Mar 2020 10:16:53 +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/kmail2.notifyrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/data/kmail2.notifyrc b/src/data/kmail2.notifyrc
index 8d9c98914..8b5f8399d 100644
--- a/src/data/kmail2.notifyrc
+++ b/src/data/kmail2.notifyrc
@@ -498,6 +498,7 @@ Name[fi]=Viestin lähetyksen voi perua
 Name[fr]=Vous pouvez annuler l'envoi d'un courriel
 Name[gl]=O envío dun correo electrónico pode desfacerse
 Name[ia]=Un message de eposta pote haber annullate le invio
+Name[it]=L'invio di un messaggio di posta è stato annullato
 Name[ko]=이메일 전송 실행 취소 가능
 Name[nl]=Verzenden van een e-mailbericht kan ongedaan gemaakt worden
 Name[pl]=Wysłanie wiadomości można wycofać