From 1aca8ce93d059b295176c24c22752e47033d3b6e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 22 Dec 2019 09:18:29 +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 402b3d9e3..05fbe9e90 100644
--- a/src/data/kmail2.notifyrc
+++ b/src/data/kmail2.notifyrc
@@ -486,6 +486,7 @@ Name[cs]=Odeslaný e-mail lze vrátit
 Name[en_GB]=An email can be undo send
 Name[es]=Se puede deshacer el envío de un correo electrónico
 Name[eu]=E-posta baten bidalketa desegin daiteke
+Name[fr]=Vous pouvez annuler l'envoi d'un courriel
 Name[gl]=O envío dun correo electrónico pode desfacerse
 Name[nl]=Verzenden van een e-mailbericht kan ongedaan gemaakt worden
 Name[pl]=Wysłanie wiadomości można wycofać