From 89431f03b2c9a4a44be7fba42fd71404a11e7bed Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Sun, 22 Jun 2025 13:19:15 +0000
Subject: [PATCH] Translate conflicts.pot in pt_BR

100% translated source file: 'conflicts.pot'
on 'pt_BR'.
---
 user_manual/locale/pt_BR/LC_MESSAGES/desktop/conflicts.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_manual/locale/pt_BR/LC_MESSAGES/desktop/conflicts.pot b/user_manual/locale/pt_BR/LC_MESSAGES/desktop/conflicts.pot
index 1e81db7b6..f7eef9d5f 100644
--- a/user_manual/locale/pt_BR/LC_MESSAGES/desktop/conflicts.pot
+++ b/user_manual/locale/pt_BR/LC_MESSAGES/desktop/conflicts.pot
@@ -120,7 +120,7 @@ msgid ""
 "\"local and remote contents\" and delete the file with \"conflicted copy\" "
 "in its name. With that, the conflict is resolved."
 msgstr ""
-"Para resolver esse conflito, abra os dois arquivos, compare as diferenças e "
+"Para resolver este conflito, abra os dois arquivos, compare as diferenças e "
 "copie as alterações locais do arquivo \"conflicted copy\" para o arquivo "
 "base, quando aplicável. Neste exemplo, você pode alterar ``mydata.txt`` para"
 " dizer \"local and remote contents\" e excluir o arquivo com \"conflicted "