From ecd6a6356498ec0bd8784595c471caf9c4e361e4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 12 Jan 2021 10:47: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"
---
 neochat.notifyrc        | 4 ++++
 org.kde.neochat.desktop | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 585bcf377..5a4fb870e 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -16,6 +16,7 @@ Name[nl]=Neochat
 Name[nn]=Neochat
 Name[pl]=Neochat
 Name[pt]=Neochat
+Name[pt_BR]=Neochat
 Name[sk]=Neochat
 Name[sl]=Neochat
 Name[sv]=Neochat
@@ -37,6 +38,7 @@ Comment[nl]=IM-client voor het Matrix-protocol
 Comment[nn]=Lynmeldings­klient for Matrix-protokollen
 Comment[pl]=Komunikator internetowy dla protokołu Matrix
 Comment[pt]=Cliente de MI para o protocolo Matrix
+Comment[pt_BR]=Cliente de mensageiro instantâneo para o protocolo Matrix
 Comment[sk]=IM klient pre protokol Matrix
 Comment[sl]=Odjemalec neposrednega sporočanja po protokolu Matrix
 Comment[sv]=Direktmeddelandeklient för protokollet Matrix
@@ -59,6 +61,7 @@ Name[nl]=Nieuw bericht
 Name[nn]=Ny melding
 Name[pl]=Nowa wiadomość
 Name[pt]=Nova mensagem
+Name[pt_BR]=Nova mensagem
 Name[sk]=Nová správa
 Name[sl]=Novo sporočilo
 Name[sv]=Nytt meddelande
@@ -79,6 +82,7 @@ Comment[nl]=Er is een nieuw bericht
 Comment[nn]=Du har ei ny melding
 Comment[pl]=Dostępna jest nowa wiadomość
 Comment[pt]=Tem uma mensagem nova
+Comment[pt_BR]=Existe uma nova mensagem
 Comment[sk]=Je nová správa
 Comment[sl]=Prišlo je novo sporočilo
 Comment[sv]=Det finns ett nytt meddelande
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index b045ac318..22404e45a 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -15,6 +15,7 @@ Name[nl]=Neochat
 Name[nn]=Neochat
 Name[pl]=Neochat
 Name[pt]=Neochat
+Name[pt_BR]=Neochat
 Name[sk]=Neochat
 Name[sl]=Neochat
 Name[sv]=Neochat
@@ -35,6 +36,7 @@ GenericName[nl]=Matrix-client
 GenericName[nn]=Matrix-klient
 GenericName[pl]=Program Matriksa
 GenericName[pt]=Cliente de Matrix
+GenericName[pt_BR]=Cliente Matrix
 GenericName[sk]=Matrix Client
 GenericName[sl]=Odjemalec Matrix
 GenericName[sv]=Matrix-klient
@@ -55,6 +57,7 @@ Comment[nl]=Client voor het Matrix-protocol
 Comment[nn]=Lynmeldings­klient for Matrix-protokollen
 Comment[pl]=Program obsługi protokołu Matriksa
 Comment[pt]=Cliente para o protocolo Matrix
+Comment[pt_BR]=Cliente para o protocolo Matrix
 Comment[sk]=Klient protokolu Matrix
 Comment[sl]=Odjemalec za protokol Matrix
 Comment[sv]=Klient för protokollet Matrix