Update translate pt-br label_my_email_is (#5217)

plone · Oct 6, 2023 · 778e961 · 778e961
1 parent 6280cd3
commit 778e961
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/locales/pt_BR/LC_MESSAGES/volto.po b/locales/pt_BR/LC_MESSAGES/volto.po
@@ -4539,7 +4539,7 @@ msgstr "Meu endereço de e-mail é"
 #: components/theme/PasswordReset/RequestPasswordReset
 # defaultMessage: My user name is
 msgid "label_my_username_is"
-msgstr "Meu nome de usuário é<<<<<<< HEAD"
+msgstr "Meu nome de usuário é "
 
 #: config/Blocks
 # defaultMessage: Lead Image Field

diff --git a/news/5217.bugfix b/news/5217.bugfix
@@ -0,0 +1 @@
+Update translate pt_br to fix merge fail @luxcas
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Update translate pt_br to fix merge fail @luxcas