diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.mo b/django/contrib/admin/locale/en/LC_MESSAGES/django.mo
index bedbdf0159c..ab866971b34 100644
Binary files a/django/contrib/admin/locale/en/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po
index 7bbb77e86f5..3b0d1698fee 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: 2011-12-22 23:56+0100\n"
+"POT-Creation-Date: 2012-03-05 02:24+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr ""
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1297
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr ""
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1299
 msgid "Are you sure?"
 msgstr ""
 
@@ -32,39 +32,39 @@ msgstr ""
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr ""
 
-#: filters.py:99 filters.py:189 filters.py:229 filters.py:266 filters.py:371
+#: filters.py:100 filters.py:190 filters.py:230 filters.py:267 filters.py:372
 msgid "All"
 msgstr ""
 
-#: filters.py:230
+#: filters.py:231
 msgid "Yes"
 msgstr ""
 
-#: filters.py:231
+#: filters.py:232
 msgid "No"
 msgstr ""
 
-#: filters.py:245
+#: filters.py:246
 msgid "Unknown"
 msgstr ""
 
-#: filters.py:295
+#: filters.py:296
 msgid "Any date"
 msgstr ""
 
-#: filters.py:296
+#: filters.py:297
 msgid "Today"
 msgstr ""
 
-#: filters.py:301
+#: filters.py:302
 msgid "Past 7 days"
 msgstr ""
 
-#: filters.py:305
+#: filters.py:306
 msgid "This month"
 msgstr ""
 
-#: filters.py:309
+#: filters.py:310
 msgid "This year"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: helpers.py:19
+#: helpers.py:20
 msgid "Action:"
 msgstr ""
 
@@ -134,132 +134,132 @@ msgstr ""
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:149 options.py:165
+#: options.py:150 options.py:166
 msgid "None"
 msgstr ""
 
-#: options.py:671
+#: options.py:673
 #, python-format
 msgid "Changed %s."
 msgstr ""
 
-#: options.py:671 options.py:681
+#: options.py:673 options.py:683
 msgid "and"
 msgstr ""
 
-#: options.py:676
+#: options.py:678
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:680
+#: options.py:682
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:685
+#: options.py:687
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:689
+#: options.py:691
 msgid "No fields changed."
 msgstr ""
 
-#: options.py:772
+#: options.py:774
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: options.py:776 options.py:824
+#: options.py:778 options.py:826
 msgid "You may edit it again below."
 msgstr ""
 
-#: options.py:788 options.py:837
+#: options.py:790 options.py:839
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: options.py:822
+#: options.py:824
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: options.py:830
+#: options.py:832
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: options.py:899 options.py:1159
+#: options.py:901 options.py:1161
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 
-#: options.py:918
+#: options.py:920
 msgid "No action selected."
 msgstr ""
 
-#: options.py:998
+#: options.py:1000
 #, python-format
 msgid "Add %s"
 msgstr ""
 
-#: options.py:1023 options.py:1267
+#: options.py:1025 options.py:1269
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr ""
 
-#: options.py:1089
+#: options.py:1091
 #, python-format
 msgid "Change %s"
 msgstr ""
 
-#: options.py:1138
+#: options.py:1140
 msgid "Database error"
 msgstr ""
 
-#: options.py:1201
+#: options.py:1203
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: options.py:1228
+#: options.py:1230
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: options.py:1233
+#: options.py:1235
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr ""
 
-#: options.py:1283
+#: options.py:1285
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: options.py:1330
+#: options.py:1332
 #, python-format
 msgid "Change history: %s"
 msgstr ""
 
-#: sites.py:311 tests.py:41 templates/admin/login.html:42
+#: sites.py:315 tests.py:61 templates/admin/login.html:49
 #: templates/registration/password_reset_complete.html:20
 #: views/decorators.py:23
 msgid "Log in"
 msgstr ""
 
-#: sites.py:376
+#: sites.py:380
 msgid "Site administration"
 msgstr ""
 
-#: sites.py:428
+#: sites.py:432
 #, python-format
 msgid "%s administration"
 msgstr ""
@@ -396,7 +396,7 @@ msgid "View on site"
 msgstr ""
 
 #: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:17
+#: templates/admin/login.html:18
 #: templates/admin/auth/user/change_password.html:29
 #: templates/registration/password_change_form.html:21
 msgid "Please correct the error below."
@@ -525,14 +525,18 @@ msgid ""
 "the appropriate user."
 msgstr ""
 
-#: templates/admin/login.html:33
+#: templates/admin/login.html:34
 msgid "Username:"
 msgstr ""
 
-#: templates/admin/login.html:37
+#: templates/admin/login.html:38
 msgid "Password:"
 msgstr ""
 
+#: templates/admin/login.html:45
+msgid "Forgotten your password or username?"
+msgstr ""
+
 #: templates/admin/object_history.html:24
 msgid "Date/time"
 msgstr ""
@@ -772,7 +776,7 @@ msgstr ""
 msgid "Reset my password"
 msgstr ""
 
-#: templatetags/admin_list.py:335
+#: templatetags/admin_list.py:336
 msgid "All dates"
 msgstr ""
 
@@ -780,12 +784,12 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: views/main.py:74
+#: views/main.py:73
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: views/main.py:76
+#: views/main.py:75
 #, python-format
 msgid "Select %s to change"
 msgstr ""
diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.mo
index af5a3ca3575..ab866971b34 100644
Binary files a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po
index c70400713cd..0e3f9053db2 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: 2011-12-22 23:56+0100\n"
+"POT-Creation-Date: 2012-03-05 02:24+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -21,13 +21,13 @@ msgstr ""
 #: static/admin/js/SelectFilter2.js:46
 #, c-format
 msgid ""
-"This is the list of available %s. You may add some by selecting them below "
-"and then clicking the \"Add\" button."
+"This is the list of available %s. You may choose some by selecting them in "
+"the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
-msgid "Type into the filter box to narrow down the list of available %s."
+msgid "Type into this box to filter down the list of available %s."
 msgstr ""
 
 #: static/admin/js/SelectFilter2.js:57
@@ -35,11 +35,16 @@ msgid "Filter"
 msgstr ""
 
 #: static/admin/js/SelectFilter2.js:61
-msgid "Add all"
+msgid "Choose all"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:61
+#, c-format
+msgid "Click to choose all %s at once."
 msgstr ""
 
 #: static/admin/js/SelectFilter2.js:67
-msgid "Add"
+msgid "Choose"
 msgstr ""
 
 #: static/admin/js/SelectFilter2.js:69
@@ -48,20 +53,25 @@ msgstr ""
 
 #: static/admin/js/SelectFilter2.js:75
 #, c-format
-msgid "Added %s"
+msgid "Chosen %s"
 msgstr ""
 
 #: static/admin/js/SelectFilter2.js:76
 #, c-format
 msgid ""
-"This is the list of added %s. You may remove some by selecting them below "
-"and then clicking the \"Remove\" button."
+"This is the list of chosen %s. You may remove some by selecting them in the "
+"box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
 msgstr ""
 
+#: static/admin/js/SelectFilter2.js:80
+#, c-format
+msgid "Click to remove all chosen %s at once."
+msgstr ""
+
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
 msgid_plural "%(sel)s of %(cnt)s selected"