Translate conflicts.pot in pt_BR

100% translated source file: 'conflicts.pot'
on 'pt_BR'.
This commit is contained in:
transifex-integration[bot] 2025-06-22 13:19:15 +00:00 committed by GitHub
parent 87f7080e9e
commit 89431f03b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -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 "