From 83f1ec877e674fad0e4f7a89f8aabd9646f4edcd Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 30 Apr 2019 05:49:52 +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/kmail2.notifyrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/data/kmail2.notifyrc b/src/data/kmail2.notifyrc
index 3a78550ff..d80059ef2 100644
--- a/src/data/kmail2.notifyrc
+++ b/src/data/kmail2.notifyrc
@@ -354,6 +354,7 @@ Name[it]=Impossibile inviare il messaggio di posta
 Name[ko]=이메일을 보낼 수 없음
 Name[nl]=Verzenden van een e-mail is onmogelijk
 Name[pt]=Não foi possível enviar o e-mail
+Name[pt_BR]=Não foi possível enviar o e-mail
 Name[sv]=Omöjligt att skicka e-post
 Name[uk]=Не вдалося надіслати повідомлення
 Name[x-test]=xxImpossible to send emailxx
@@ -367,6 +368,7 @@ Comment[it]=Problema durante l'invio della posta
 Comment[ko]=이메일 전송 중 문제 발생
 Comment[nl]=probleem bij verzenden van e-mail
 Comment[pt]=Ocorreu um problema no envio do e-mail
+Comment[pt_BR]=Problema ao enviar o e-mail
 Comment[sv]=Problem när e-post skulle skickas
 Comment[uk]=Проблема під час надсилання пошти
 Comment[x-test]=xxProblem during send mailxx