From 05548bc8a933c2def064cdf6ca3b7168c87cba17 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 24 Mar 2021 05:54:34 +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        | 1 +
 org.kde.neochat.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 1d2a5ed7d..03246aada 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -9,6 +9,7 @@ Name[ia]=Neochat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pt]=NeoChat
+Name[pt_BR]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[uk]=NeoChat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index da5f8724c..a20ad302c 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -8,6 +8,7 @@ Name[ia]=Neochat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pt]=NeoChat
+Name[pt_BR]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[uk]=NeoChat