From 03ec17366e20130b6a1aa657d13cac72bd4f0607 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 3 Jun 2021 02:27:05 +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        | 1 +
 org.kde.neochat.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 5715cea66..3f3d35dca 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -14,6 +14,7 @@ Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pl]=NeoChat
+Name[pt_BR]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index a2e79ef6a..ef22859bd 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -13,6 +13,7 @@ Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pl]=NeoChat
+Name[pt_BR]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat