From 3af9c11b3b12729be26ef9da9cc32276a032d3cd Mon Sep 17 00:00:00 2001 From: Natalia <124304+nessita@users.noreply.github.com> Date: Wed, 22 May 2024 11:57:28 -0300 Subject: [PATCH] [5.1.x] Updated source translation catalogs. --- django/conf/locale/en/LC_MESSAGES/django.po | 24 +++++--- .../admin/locale/en/LC_MESSAGES/django.po | 25 +++++++-- .../admin/locale/en/LC_MESSAGES/djangojs.po | 11 +--- .../auth/locale/en/LC_MESSAGES/django.po | 56 ++++++++++++++++--- 4 files changed, 85 insertions(+), 31 deletions(-) diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index cb9e747144..b47726e67a 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -448,6 +448,10 @@ msgstr "" msgid "Enter a valid value." msgstr "" +#: core/validators.py:70 +msgid "Enter a valid domain name." +msgstr "" + #: core/validators.py:104 forms/fields.py:759 msgid "Enter a valid URL." msgstr "" @@ -472,16 +476,22 @@ msgid "" "hyphens." msgstr "" -#: core/validators.py:279 core/validators.py:306 -msgid "Enter a valid IPv4 address." +#: core/validators.py:327 core/validators.py:336 core/validators.py:350 +#: db/models/fields/__init__.py:2219 +#, python-format +msgid "Enter a valid %(protocol)s address." msgstr "" -#: core/validators.py:286 core/validators.py:307 -msgid "Enter a valid IPv6 address." +#: core/validators.py:329 +msgid "IPv4" msgstr "" -#: core/validators.py:298 core/validators.py:305 -msgid "Enter a valid IPv4 or IPv6 address." +#: core/validators.py:338 utils/ipv6.py:30 +msgid "IPv6" +msgstr "" + +#: core/validators.py:352 +msgid "IPv4 or IPv6" msgstr "" #: core/validators.py:341 diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po index d771ecbcad..c216532a03 100644 --- a/django/contrib/admin/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -247,11 +247,6 @@ msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -#: contrib/admin/options.py:1497 -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" - #: contrib/admin/options.py:1516 #, python-brace-format msgid "" @@ -475,6 +470,10 @@ msgstr "" msgid "Change password" msgstr "" +#: contrib/admin/templates/admin/auth/user/change_password.html:18 +msgid "Set password" +msgstr "" + #: contrib/admin/templates/admin/auth/user/change_password.html:25 #: contrib/admin/templates/admin/change_form.html:43 #: contrib/admin/templates/admin/change_list.html:52 @@ -490,6 +489,20 @@ msgstr[1] "" msgid "Enter a new password for the user %(username)s." msgstr "" +#: contrib/admin/templates/admin/auth/user/change_password.html:35 +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:71 +msgid "Disable password-based authentication" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:73 +msgid "Enable password-based authentication" +msgstr "" + #: contrib/admin/templates/admin/base.html:28 msgid "Skip to main content" msgstr "" diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po index b0b92fb140..443c0b9558 100644 --- a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 15:04-0300\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -381,12 +381,3 @@ msgstr "" msgctxt "one letter Saturday" msgid "S" msgstr "" - -#: contrib/admin/static/admin/js/collapse.js:16 -#: contrib/admin/static/admin/js/collapse.js:34 -msgid "Show" -msgstr "" - -#: contrib/admin/static/admin/js/collapse.js:30 -msgid "Hide" -msgstr "" diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.po b/django/contrib/auth/locale/en/LC_MESSAGES/django.po index 8b15915f9f..42929e9653 100644 --- a/django/contrib/auth/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -31,15 +31,28 @@ msgstr "" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" +#: contrib/auth/admin.py:177 +msgid "Conflicting form data submitted. Please try again." +msgstr "" + #: contrib/auth/admin.py:168 msgid "Password changed successfully." msgstr "" +#: contrib/auth/admin.py:187 +msgid "Password-based authentication was disabled." +msgstr "" + #: contrib/auth/admin.py:189 #, python-format msgid "Change password: %s" msgstr "" +#: contrib/auth/admin.py:210 +#, python-format +msgid "Set password: %s" +msgstr "" + #: contrib/auth/apps.py:16 msgid "Authentication and Authorization" msgstr "" @@ -60,10 +73,25 @@ msgstr "" msgid "Invalid password format or unknown hashing algorithm." msgstr "" +#: contrib/auth/forms.py:59 +msgid "Reset password" +msgstr "" + +#: contrib/auth/forms.py:59 +msgid "Set password" +msgstr "" + #: contrib/auth/forms.py:91 contrib/auth/forms.py:379 contrib/auth/forms.py:457 msgid "The two password fields didn’t match." msgstr "" +#: contrib/auth/forms.py:107 +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" + #: contrib/auth/forms.py:94 contrib/auth/forms.py:166 contrib/auth/forms.py:201 #: contrib/auth/forms.py:461 msgid "Password" @@ -77,10 +105,26 @@ msgstr "" msgid "Enter the same password as before, for verification." msgstr "" -#: contrib/auth/forms.py:168 +#: contrib/auth/forms.py:133 +msgid "Password-based authentication" +msgstr "" + +#: contrib/auth/forms.py:136 +msgid "Enabled" +msgstr "" + +#: contrib/auth/forms.py:136 +msgid "Disabled" +msgstr "" + +#: contrib/auth/forms.py:260 msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." +msgstr "" + +#: contrib/auth/forms.py:276 +msgid "" +"Enable password-based authentication for this user by setting a password." msgstr "" #: contrib/auth/forms.py:208 @@ -114,10 +158,6 @@ msgstr "" msgid "Old password" msgstr "" -#: contrib/auth/forms.py:469 -msgid "Password (again)" -msgstr "" - #: contrib/auth/hashers.py:327 contrib/auth/hashers.py:420 #: contrib/auth/hashers.py:510 contrib/auth/hashers.py:605 #: contrib/auth/hashers.py:665 contrib/auth/hashers.py:707