From 862026a8b93febcf20f91479d07fea0e47118836 Mon Sep 17 00:00:00 2001
From: antoliny0919 <antoliny0919@gmail.com>
Date: Tue, 8 Oct 2024 09:27:20 +0200
Subject: [PATCH] Fixed #35742 -- Removed hardcoded "username" references in
 admin templates.

---
 django/contrib/admin/templates/admin/auth/user/add_form.html  | 4 +---
 django/contrib/admin/templates/admin/login.html               | 2 +-
 .../admin/templates/registration/password_reset_email.html    | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/django/contrib/admin/templates/admin/auth/user/add_form.html b/django/contrib/admin/templates/admin/auth/user/add_form.html
index 48406f11a2..a13e75e89a 100644
--- a/django/contrib/admin/templates/admin/auth/user/add_form.html
+++ b/django/contrib/admin/templates/admin/auth/user/add_form.html
@@ -3,9 +3,7 @@
 
 {% block form_top %}
   {% if not is_popup %}
-    <p>{% translate 'First, enter a username and password. Then, you’ll be able to edit more user options.' %}</p>
-  {% else %}
-    <p>{% translate "Enter a username and password." %}</p>
+    <p>{% translate "After you've created a user, you’ll be able to edit more user options." %}</p>
   {% endif %}
 {% endblock %}
 {% block extrahead %}
diff --git a/django/contrib/admin/templates/admin/login.html b/django/contrib/admin/templates/admin/login.html
index 3999dd3703..fa0dcbc01d 100644
--- a/django/contrib/admin/templates/admin/login.html
+++ b/django/contrib/admin/templates/admin/login.html
@@ -57,7 +57,7 @@
   {% url 'admin_password_reset' as password_reset_url %}
   {% if password_reset_url %}
   <div class="password-reset-link">
-    <a href="{{ password_reset_url }}">{% translate 'Forgotten your password or username?' %}</a>
+    <a href="{{ password_reset_url }}">{% translate 'Forgotten your login credentials?' %}</a>
   </div>
   {% endif %}
   <div class="submit-row">
diff --git a/django/contrib/admin/templates/registration/password_reset_email.html b/django/contrib/admin/templates/registration/password_reset_email.html
index 64822091d1..2a428c48ce 100644
--- a/django/contrib/admin/templates/registration/password_reset_email.html
+++ b/django/contrib/admin/templates/registration/password_reset_email.html
@@ -5,7 +5,7 @@
 {% block reset_link %}
 {{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
 {% endblock %}
-{% translate 'Your username, in case you’ve forgotten:' %} {{ user.get_username }}
+{% translate 'In case you’ve forgotten, you are:' %} {{ user.get_username }}
 
 {% translate "Thanks for using our site!" %}