git: merge conflict with weblate

This commit is contained in:
Herculino Trotta
2025-06-29 16:27:15 -03:00

View File

@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-06-29 17:42+0000\n"
"PO-Revision-Date: 2025-06-20 07:16+0000\n"
"POT-Creation-Date: 2025-06-29 04:15+0000\n"
"PO-Revision-Date: 2025-06-29 17:42+0000\n"
"Last-Translator: Herculino Trotta <netotrotta@gmail.com>\n"
"Language-Team: Portuguese (Brazil) <https://translations.herculino.com/"
"projects/wygiwyh/app/pt_BR/>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 5.11.4\n"
"X-Generator: Weblate 5.12.2\n"
#: apps/accounts/forms.py:24
msgid "Group name"
@@ -436,12 +436,12 @@ msgstr "Informação"
msgid "Cache cleared successfully"
msgstr "Cache limpo com sucesso"
#: apps/common/widgets/datepicker.py:55 apps/common/widgets/datepicker.py:208
#: apps/common/widgets/datepicker.py:266
#: apps/common/widgets/datepicker.py:53 apps/common/widgets/datepicker.py:206
#: apps/common/widgets/datepicker.py:264
msgid "Today"
msgstr "Hoje"
#: apps/common/widgets/datepicker.py:141
#: apps/common/widgets/datepicker.py:139
msgid "Now"
msgstr "Agora"
@@ -1845,7 +1845,7 @@ msgstr "Calendário"
#: apps/users/models.py:480
msgid "Volume"
msgstr ""
msgstr "Volume"
#: apps/users/models.py:499
msgid "Language"
@@ -2674,10 +2674,8 @@ msgid "Calculator"
msgstr "Calculadora"
#: templates/includes/navbar/user_menu.html:6
#, fuzzy
#| msgid "Import Profiles"
msgid "Profile"
msgstr "Perfis de Importação"
msgstr "Perfil"
#: templates/includes/navbar/user_menu.html:15
msgid "Settings"