From 8c0a6c1079220534b04981edce7fb8e77c5c7683 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 25 Nov 2021 01:30:18 +0000
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"
---
 neochat.notifyrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 02b1f9444..3e73c8242 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -133,6 +133,7 @@ Name[ia]=Nove invitation
 Name[ko]=새 초대장
 Name[nl]=Nieuwe uitnodiging
 Name[pt]=Novo Convite
+Name[pt_BR]=Novo convite
 Name[sl]=Novo povabilo
 Name[sv]=Ny inbjudan
 Name[uk]=Нове запрошення
@@ -146,6 +147,7 @@ Comment[ia]=Il ha un nove invitation a un sala
 Comment[ko]=새로운 대화방 초대장을 받음
 Comment[nl]=Er is een nieuwe uitnodiging naar een room
 Comment[pt]=Existe um novo convite para uma sala
+Comment[pt_BR]=Existe um novo convite para uma sala
 Comment[sl]=Tam je novo povabilo v sobo
 Comment[sv]=Det finns en ny inbjudan till ett rum
 Comment[uk]=У кімнаті нове запрошення