diff --git a/wagtail/admin/locale/en/LC_MESSAGES/django.po b/wagtail/admin/locale/en/LC_MESSAGES/django.po
index 4da6fad297..2cd2a8cc60 100644
--- a/wagtail/admin/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/admin/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,7 +43,7 @@ msgid "Cancel workflow "
 msgstr ""
 
 #: action_menu.py:186 templates/wagtailadmin/pages/confirm_unpublish.html:5
-#: wagtail_hooks.py:228
+#: wagtail_hooks.py:261
 msgid "Unpublish"
 msgstr ""
 
@@ -53,7 +53,7 @@ msgstr ""
 #: templates/wagtailadmin/pages/confirm_delete.html:6
 #: templates/wagtailadmin/permissions/includes/collection_member_permissions_form.html:16
 #: templates/wagtailadmin/workflows/includes/workflow_pages_form.html:8
-#: views/generic/models.py:97 wagtail_hooks.py:217
+#: views/generic/models.py:97 wagtail_hooks.py:250
 msgid "Delete"
 msgstr ""
 
@@ -67,7 +67,7 @@ msgstr ""
 
 #: action_menu.py:247 templates/wagtailadmin/home/locked_pages.html:30
 #: templates/wagtailadmin/reports/listing/_list_unlock.html:42
-#: views/pages/edit.py:236 views/pages/edit.py:253
+#: views/pages/edit.py:339 views/pages/edit.py:356
 msgid "Unlock"
 msgstr ""
 
@@ -101,88 +101,73 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: edit_handlers.py:773
+#: edit_handlers.py:792
 msgid "Scheduled publishing"
 msgstr ""
 
-#: edit_handlers.py:783
+#: edit_handlers.py:802
 #: templates/wagtailadmin/collections/_privacy_switch.html:7
 #: templates/wagtailadmin/pages/_privacy_switch.html:10
 msgid "Privacy"
 msgstr ""
 
-#: edit_handlers.py:899
+#: edit_handlers.py:921
 msgid "For search engines"
 msgstr ""
 
-#: edit_handlers.py:902
+#: edit_handlers.py:924
 msgid "For site menus"
 msgstr ""
 
-#: edit_handlers.py:928
+#: edit_handlers.py:955
 msgid "Content"
 msgstr ""
 
-#: edit_handlers.py:931
+#: edit_handlers.py:958
 msgid "Promote"
 msgstr ""
 
-#: edit_handlers.py:934 wagtail_hooks.py:64
+#: edit_handlers.py:961 wagtail_hooks.py:86
 msgid "Settings"
 msgstr ""
 
-#: filters.py:21
+#: filters.py:18
 msgid "Date from"
 msgstr ""
 
-#: filters.py:21
+#: filters.py:18
 msgid "Date to"
 msgstr ""
 
-#: filters.py:93 filters.py:130 filters.py:166
-#: templates/wagtailadmin/pages/search_results.html:19
+#: filters.py:90 templates/wagtailadmin/pages/search_results.html:19
 #: templates/wagtailadmin/pages/search_results.html:21
+#: views/reports/workflows.py:30 views/reports/workflows.py:66
 #: widgets/button_select.py:20
 msgid "All"
 msgstr ""
 
-#: filters.py:123 filters.py:148
-#: templates/wagtailadmin/pages/workflow_history/list.html:17
-#: templates/wagtailadmin/reports/workflow.html:32
-#: templates/wagtailadmin/reports/workflow_tasks.html:26 views/reports.py:108
-msgid "Started at"
+#: forms/account.py:72
+msgid "Preferred language"
 msgstr ""
 
-#: filters.py:125 filters.py:161
-msgid "Show"
+#: forms/account.py:77
+msgid "Current time zone"
 msgstr ""
 
-#: filters.py:128 filters.py:164
-msgid "Awaiting my review"
+#: forms/account.py:86
+msgid "First Name"
 msgstr ""
 
-#: filters.py:149 templates/wagtailadmin/reports/workflow_tasks.html:29
-msgid "Completed at"
+#: forms/account.py:87
+msgid "Last Name"
 msgstr ""
 
-#: filters.py:151 templates/wagtailadmin/reports/workflow.html:17
-msgid "Workflow"
+#: forms/account.py:88
+msgid "Email"
 msgstr ""
 
-#: filters.py:189 filters.py:205
-#: templates/wagtailadmin/home/recent_edits.html:14
-msgid "Date"
-msgstr ""
-
-#: filters.py:190 templates/wagtailadmin/home/locked_pages.html:14
-#: templates/wagtailadmin/home/pages_for_moderation.html:13
-#: templates/wagtailadmin/home/recent_edits.html:12
-#: templates/wagtailadmin/home/user_pages_in_workflow_moderation.html:12
-#: templates/wagtailadmin/home/workflow_pages_to_moderate.html:12
-#: templates/wagtailadmin/pages/listing/_table_headers_explore.html:36
-#: templates/wagtailadmin/reports/listing/_list_page_report.html:8
-#: templates/wagtailadmin/workflows/usage.html:16 views/reports.py:173
-msgid "Title"
+#: forms/account.py:104
+msgid "Upload a profile picture"
 msgstr ""
 
 #: forms/auth.py:14
@@ -304,19 +289,19 @@ msgstr ""
 msgid "You cannot copy a page into itself when copying subpages"
 msgstr ""
 
-#: forms/pages.py:138
+#: forms/pages.py:158
 msgid "This slug is already in use"
 msgstr ""
 
-#: forms/pages.py:147
+#: forms/pages.py:167
 msgid "Go live date/time must be before expiry date/time"
 msgstr ""
 
-#: forms/pages.py:153
+#: forms/pages.py:173
 msgid "Expiry date/time must be in the future"
 msgstr ""
 
-#: forms/search.py:8 forms/workflows.py:19
+#: forms/search.py:8 forms/workflows.py:19 localization.py:102
 #: templates/wagtailadmin/pages/search.html:3
 #: templates/wagtailadmin/pages/search.html:17
 #: templates/wagtailadmin/shared/menu_search.html:5
@@ -367,11 +352,11 @@ msgstr ""
 #: templates/wagtailadmin/home/workflow_pages_to_moderate.html:42
 #: templates/wagtailadmin/pages/revisions/_actions.html:7
 #: views/generic/models.py:74 views/generic/models.py:141
-#: views/pages/create.py:120 views/pages/edit.py:149
+#: views/pages/create.py:120 views/pages/edit.py:248
 #: views/pages/moderation.py:28 views/pages/moderation.py:50
 #: views/pages/move.py:75 views/pages/revisions.py:174
 #: views/pages/unpublish.py:43 views/workflows.py:108 views/workflows.py:198
-#: wagtail_hooks.py:132
+#: wagtail_hooks.py:160
 msgid "Edit"
 msgstr ""
 
@@ -382,7 +367,7 @@ msgstr ""
 msgid "Page"
 msgstr ""
 
-#: localization.py:56 wagtail_hooks.py:51 wagtail_hooks.py:78
+#: localization.py:56 wagtail_hooks.py:63 wagtail_hooks.py:100
 msgid "Pages"
 msgstr ""
 
@@ -484,8 +469,8 @@ msgstr ""
 #: templates/wagtailadmin/generic/create.html:24
 #: templates/wagtailadmin/generic/edit.html:27
 #: templates/wagtailadmin/page_privacy/set_privacy.html:16
-#: templates/wagtailadmin/workflows/edit.html:72
-#: templates/wagtailadmin/workflows/edit_task.html:56
+#: templates/wagtailadmin/workflows/edit.html:74
+#: templates/wagtailadmin/workflows/edit_task.html:58
 msgid "Save"
 msgstr ""
 
@@ -547,7 +532,7 @@ msgstr ""
 msgid "Unfocus comment"
 msgstr ""
 
-#: localization.py:95 templates/wagtailadmin/pages/history.html:35
+#: localization.py:95 templates/wagtailadmin/pages/history.html:36
 msgid "Comment"
 msgstr ""
 
@@ -555,6 +540,27 @@ msgstr ""
 msgid "More actions"
 msgstr ""
 
+#: localization.py:97
+msgid "Save the page to add this comment"
+msgstr ""
+
+#: localization.py:98
+msgid "Save the page to save this comment"
+msgstr ""
+
+#: localization.py:99
+msgid "Save the page to save this reply"
+msgstr ""
+
+#: localization.py:100 templates/wagtailadmin/base.html:8
+#: templates/wagtailadmin/base.html:20 templates/wagtailadmin/home.html:3
+msgid "Dashboard"
+msgstr ""
+
+#: localization.py:101 templates/wagtailadmin/shared/main_nav.html:8
+msgid "Edit your account"
+msgstr ""
+
 #: templates/wagtailadmin/404.html:3
 msgid "Error 404: Page not found"
 msgstr ""
@@ -568,12 +574,13 @@ msgid "The requested page could not be found."
 msgstr ""
 
 #: templates/wagtailadmin/404.html:29
-#: templates/wagtailadmin/userbar/item_admin.html:8
+#: templates/wagtailadmin/userbar/item_admin.html:7
 msgid "Go to Wagtail admin"
 msgstr ""
 
 #: templates/wagtailadmin/account/account.html:4
 #: templates/wagtailadmin/account/account.html:6
+#: templatetags/wagtailadmin_tags.py:691
 msgid "Account"
 msgstr ""
 
@@ -651,7 +658,7 @@ msgid "Password reset"
 msgstr ""
 
 #: templates/wagtailadmin/account/password_reset/form.html:18
-#: templates/wagtailadmin/login.html:86
+#: templates/wagtailadmin/login.html:89
 msgid "Reset your password"
 msgstr ""
 
@@ -663,12 +670,7 @@ msgstr ""
 msgid "Reset to default"
 msgstr ""
 
-#: templates/wagtailadmin/base.html:7 templates/wagtailadmin/base.html:17
-#: templates/wagtailadmin/home.html:3
-msgid "Dashboard"
-msgstr ""
-
-#: templates/wagtailadmin/base.html:52
+#: templates/wagtailadmin/base.html:56
 msgid "Menu"
 msgstr ""
 
@@ -842,7 +844,19 @@ msgstr ""
 msgid "Add comment"
 msgstr ""
 
-#: templates/wagtailadmin/edit_handlers/tabbed_interface.html:22
+#: templates/wagtailadmin/edit_handlers/tabbed_interface.html:15
+msgid "Comments"
+msgstr ""
+
+#: templates/wagtailadmin/edit_handlers/tabbed_interface.html:24
+msgid "Toggle visibility of comment notifications dropdown"
+msgstr ""
+
+#: templates/wagtailadmin/edit_handlers/tabbed_interface.html:29
+msgid "Commenting on this page"
+msgstr ""
+
+#: templates/wagtailadmin/edit_handlers/tabbed_interface.html:32
 msgid "Comment notifications"
 msgstr ""
 
@@ -870,6 +884,18 @@ msgstr ""
 msgid "Your locked pages"
 msgstr ""
 
+#: templates/wagtailadmin/home/locked_pages.html:14
+#: templates/wagtailadmin/home/pages_for_moderation.html:13
+#: templates/wagtailadmin/home/recent_edits.html:12
+#: templates/wagtailadmin/home/user_pages_in_workflow_moderation.html:12
+#: templates/wagtailadmin/home/workflow_pages_to_moderate.html:12
+#: templates/wagtailadmin/pages/listing/_table_headers_explore.html:36
+#: templates/wagtailadmin/reports/listing/_list_page_report.html:8
+#: templates/wagtailadmin/workflows/usage.html:16
+#: views/reports/audit_logging.py:25 views/reports/audit_logging.py:50
+msgid "Title"
+msgstr ""
+
 #: templates/wagtailadmin/home/locked_pages.html:16
 msgid "Locked at"
 msgstr ""
@@ -883,7 +909,7 @@ msgstr ""
 #: templates/wagtailadmin/pages/listing/_page_title_explore.html:13
 #: templates/wagtailadmin/pages/revisions/compare.html:14
 #: templates/wagtailadmin/reports/site_history.html:30
-#: templates/wagtailadmin/userbar/item_page_edit.html:8
+#: templates/wagtailadmin/userbar/item_page_edit.html:7
 #: templates/wagtailadmin/workflows/usage.html:26 widgets/chooser.py:80
 msgid "Edit this page"
 msgstr ""
@@ -920,8 +946,8 @@ msgstr ""
 #: templates/wagtailadmin/pages/listing/_table_headers_explore.html:50
 #: templates/wagtailadmin/reports/listing/_list_page_report.html:14
 #: templates/wagtailadmin/workflows/task_index.html:35
-#: templates/wagtailadmin/workflows/usage.html:18 views/reports.py:58
-#: views/reports.py:174
+#: templates/wagtailadmin/workflows/usage.html:18
+#: views/reports/audit_logging.py:51 views/reports/base.py:48
 msgid "Type"
 msgstr ""
 
@@ -934,14 +960,14 @@ msgid "Preview this page"
 msgstr ""
 
 #: templates/wagtailadmin/home/pages_for_moderation.html:40
-#: templates/wagtailadmin/userbar/item_page_approve.html:8
-#: templates/wagtailadmin/userbar/item_page_approve.html:10
+#: templates/wagtailadmin/userbar/item_page_approve.html:7
+#: templates/wagtailadmin/userbar/item_page_approve.html:9
 msgid "Approve"
 msgstr ""
 
 #: templates/wagtailadmin/home/pages_for_moderation.html:46
-#: templates/wagtailadmin/userbar/item_page_reject.html:8
-#: templates/wagtailadmin/userbar/item_page_reject.html:10
+#: templates/wagtailadmin/userbar/item_page_reject.html:7
+#: templates/wagtailadmin/userbar/item_page_reject.html:9
 msgid "Reject"
 msgstr ""
 
@@ -965,11 +991,16 @@ msgstr ""
 #: templates/wagtailadmin/reports/listing/_list_page_report.html:17
 #: templates/wagtailadmin/reports/workflow.html:23
 #: templates/wagtailadmin/reports/workflow_tasks.html:23
-#: templates/wagtailadmin/workflows/usage.html:19 views/reports.py:57
-#: views/reports.py:107 views/reports.py:140
+#: templates/wagtailadmin/workflows/usage.html:19 views/reports/base.py:47
+#: views/reports/workflows.py:90 views/reports/workflows.py:123
 msgid "Status"
 msgstr ""
 
+#: templates/wagtailadmin/home/recent_edits.html:14 views/pages/history.py:31
+#: views/reports/audit_logging.py:24
+msgid "Date"
+msgstr ""
+
 #: templates/wagtailadmin/home/site_summary.html:3
 msgid "Site summary"
 msgstr ""
@@ -1025,7 +1056,7 @@ msgstr ""
 msgid "Tasks"
 msgstr ""
 
-#: templates/wagtailadmin/login.html:3 templates/wagtailadmin/login.html:80
+#: templates/wagtailadmin/login.html:3 templates/wagtailadmin/login.html:82
 msgid "Sign in"
 msgstr ""
 
@@ -1038,12 +1069,12 @@ msgstr ""
 msgid "Sign in to Wagtail"
 msgstr ""
 
-#: templates/wagtailadmin/login.html:80
+#: templates/wagtailadmin/login.html:82
 msgid "Signing in…"
 msgstr ""
 
-#: templates/wagtailadmin/login.html:86
-msgid "Forgotten it?"
+#: templates/wagtailadmin/login.html:89
+msgid "Forgotten password?"
 msgstr ""
 
 #: templates/wagtailadmin/notifications/approved.html:5
@@ -1344,8 +1375,8 @@ msgid "Publish this version"
 msgstr ""
 
 #: templates/wagtailadmin/pages/action_menu/save_draft.html:2
-#: templates/wagtailadmin/workflows/edit.html:71
-#: templates/wagtailadmin/workflows/edit_task.html:55
+#: templates/wagtailadmin/workflows/edit.html:73
+#: templates/wagtailadmin/workflows/edit_task.html:57
 msgid "Saving…"
 msgstr ""
 
@@ -1385,7 +1416,7 @@ msgid "Convert alias"
 msgstr ""
 
 #: templates/wagtailadmin/pages/confirm_convert_alias.html:11
-msgid "Are you sure you want to convert this alias into a regular page?"
+msgid "Are you sure you want to convert this alias into an ordinary page?"
 msgstr ""
 
 #: templates/wagtailadmin/pages/confirm_convert_alias.html:15
@@ -1444,7 +1475,7 @@ msgstr ""
 msgid "Move %(title)s"
 msgstr ""
 
-#: templates/wagtailadmin/pages/confirm_move.html:5 wagtail_hooks.py:195
+#: templates/wagtailadmin/pages/confirm_move.html:5 wagtail_hooks.py:223
 msgid "Move"
 msgstr ""
 
@@ -1539,7 +1570,7 @@ msgstr ""
 msgid "Copy %(title)s"
 msgstr ""
 
-#: templates/wagtailadmin/pages/copy.html:5 wagtail_hooks.py:206
+#: templates/wagtailadmin/pages/copy.html:5 wagtail_hooks.py:234
 msgid "Copy"
 msgstr ""
 
@@ -1562,8 +1593,8 @@ msgstr ""
 msgid "Actions"
 msgstr ""
 
-#: templates/wagtailadmin/pages/create.html:112
-#: templates/wagtailadmin/pages/edit.html:159
+#: templates/wagtailadmin/pages/create.html:119
+#: templates/wagtailadmin/pages/edit.html:166
 msgid "This page has unsaved changes."
 msgstr ""
 
@@ -1577,7 +1608,7 @@ msgstr ""
 msgid "Editing %(page_type)s"
 msgstr ""
 
-#: templates/wagtailadmin/pages/edit.html:29 wagtail_hooks.py:236
+#: templates/wagtailadmin/pages/edit.html:29 wagtail_hooks.py:268
 msgid "History"
 msgstr ""
 
@@ -1590,7 +1621,7 @@ msgid "Edit original page"
 msgstr ""
 
 #: templates/wagtailadmin/pages/edit_alias.html:12
-msgid "Convert this alias into a regular page"
+msgid "Convert this alias into an ordinary page"
 msgstr ""
 
 #: templates/wagtailadmin/pages/history.html:4
@@ -1613,28 +1644,28 @@ msgstr ""
 msgid "Date / Time"
 msgstr ""
 
-#: templates/wagtailadmin/pages/history.html:39
+#: templates/wagtailadmin/pages/history.html:41
 #: templates/wagtailadmin/pages/revisions/list.html:28
 msgid "Live version"
 msgstr ""
 
-#: templates/wagtailadmin/pages/history.html:41
+#: templates/wagtailadmin/pages/history.html:43
 #: templates/wagtailadmin/pages/revisions/list.html:27
 msgid "Current draft"
 msgstr ""
 
-#: templates/wagtailadmin/pages/history.html:50
+#: templates/wagtailadmin/pages/history.html:52
 #: templates/wagtailadmin/pages/listing/_list.html:27
 #: templates/wagtailadmin/pages/listing/_list.html:68
 #: templates/wagtailadmin/pages/workflow_history/list.html:48
 #: templates/wagtailadmin/reports/site_history.html:45
-#: templatetags/wagtailadmin_tags.py:556 templatetags/wagtailadmin_tags.py:579
+#: templatetags/wagtailadmin_tags.py:589 templatetags/wagtailadmin_tags.py:612
 #, python-format
 msgid "%(time_period)s ago"
 msgstr ""
 
-#: templates/wagtailadmin/pages/history.html:57
-#: templates/wagtailadmin/pages/history.html:62
+#: templates/wagtailadmin/pages/history.html:59
+#: templates/wagtailadmin/pages/history.html:64
 #: templates/wagtailadmin/reports/site_history.html:52
 #: templates/wagtailadmin/reports/site_history.html:57
 msgid "No log entries found."
@@ -1653,7 +1684,7 @@ msgstr ""
 #: templates/wagtailadmin/pages/listing/_list_move.html:15
 #: templates/wagtailadmin/pages/listing/_table_headers_explore.html:46
 #: templates/wagtailadmin/reports/listing/_list_page_report.html:11
-#: views/reports.py:56
+#: views/reports/base.py:46
 msgid "Updated"
 msgstr ""
 
@@ -1741,7 +1772,7 @@ msgid "Add a child page to '%(title)s'"
 msgstr ""
 
 #: templates/wagtailadmin/pages/listing/_navigation_explore.html:11
-#: wagtail_hooks.py:160 wagtail_hooks.py:170
+#: wagtail_hooks.py:188 wagtail_hooks.py:198
 msgid "Add child page"
 msgstr ""
 
@@ -1851,7 +1882,7 @@ msgid "Comparing"
 msgstr ""
 
 #: templates/wagtailadmin/pages/revisions/compare.html:13
-#: views/pages/history.py:130
+#: views/pages/history.py:158
 msgid "Page history"
 msgstr ""
 
@@ -2079,6 +2110,14 @@ msgstr ""
 msgid "Requested by"
 msgstr ""
 
+#: templates/wagtailadmin/pages/workflow_history/list.html:17
+#: templates/wagtailadmin/reports/workflow.html:32
+#: templates/wagtailadmin/reports/workflow_tasks.html:26
+#: views/reports/workflows.py:23 views/reports/workflows.py:48
+#: views/reports/workflows.py:91
+msgid "Started at"
+msgstr ""
+
 #: templates/wagtailadmin/pages/workflow_history/list.html:33
 msgid "Approved task"
 msgstr ""
@@ -2159,6 +2198,11 @@ msgstr ""
 msgid "By Task"
 msgstr ""
 
+#: templates/wagtailadmin/reports/workflow.html:17
+#: views/reports/workflows.py:51
+msgid "Workflow"
+msgstr ""
+
 #: templates/wagtailadmin/reports/workflow.html:74
 #: templates/wagtailadmin/reports/workflow_tasks.html:58
 msgid "No pages have been submitted for moderation yet"
@@ -2168,6 +2212,11 @@ msgstr ""
 msgid "By Workflow"
 msgstr ""
 
+#: templates/wagtailadmin/reports/workflow_tasks.html:29
+#: views/reports/workflows.py:49
+msgid "Completed at"
+msgstr ""
+
 #: templates/wagtailadmin/shared/ajax_pagination_nav.html:5
 #: templates/wagtailadmin/shared/pagination_nav.html:17
 #, python-format
@@ -2191,15 +2240,12 @@ msgstr ""
 msgid "All collections"
 msgstr ""
 
-#: templates/wagtailadmin/shared/main_nav.html:8
-msgid "Edit your account"
-msgstr ""
-
 #: templates/wagtailadmin/shared/main_nav.html:16
 msgid "Account settings"
 msgstr ""
 
 #: templates/wagtailadmin/shared/main_nav.html:17
+#: templatetags/wagtailadmin_tags.py:692
 msgid "Log out"
 msgstr ""
 
@@ -2263,14 +2309,14 @@ msgid "Skip to main content"
 msgstr ""
 
 #: templates/wagtailadmin/userbar/base.html:25
-msgid "Go to Wagtail admin interface"
+msgid "View Wagtail quick actions"
 msgstr ""
 
-#: templates/wagtailadmin/userbar/item_page_add.html:8
+#: templates/wagtailadmin/userbar/item_page_add.html:7
 msgid "Add a child page"
 msgstr ""
 
-#: templates/wagtailadmin/userbar/item_page_explore.html:8
+#: templates/wagtailadmin/userbar/item_page_explore.html:7
 msgid "Show in Explorer"
 msgstr ""
 
@@ -2287,24 +2333,24 @@ msgstr ""
 msgid "Are you sure you want to disable this task?"
 msgstr ""
 
-#: templates/wagtailadmin/workflows/create.html:36
-#: templates/wagtailadmin/workflows/edit.html:37
+#: templates/wagtailadmin/workflows/create.html:38
+#: templates/wagtailadmin/workflows/edit.html:39
 msgid "Assign your workflow to pages"
 msgstr ""
 
-#: templates/wagtailadmin/workflows/create.html:53
-#: templates/wagtailadmin/workflows/create_task.html:44
+#: templates/wagtailadmin/workflows/create.html:55
+#: templates/wagtailadmin/workflows/create_task.html:46
 #: templates/wagtailadmin/workflows/task_chooser/includes/create_form.html:12
 msgid "Creating…"
 msgstr ""
 
-#: templates/wagtailadmin/workflows/create.html:54
-#: templates/wagtailadmin/workflows/create_task.html:45
+#: templates/wagtailadmin/workflows/create.html:56
+#: templates/wagtailadmin/workflows/create_task.html:47
 #: templates/wagtailadmin/workflows/task_chooser/includes/create_form.html:12
 msgid "Create"
 msgstr ""
 
-#: templates/wagtailadmin/workflows/edit.html:45
+#: templates/wagtailadmin/workflows/edit.html:47
 #, python-format
 msgid ""
 "Workflows apply to child pages too. If you select a parent page here, its "
@@ -2312,15 +2358,15 @@ msgid ""
 "\">the list of the pages</a> your workflow applies to."
 msgstr ""
 
-#: templates/wagtailadmin/workflows/edit.html:56
+#: templates/wagtailadmin/workflows/edit.html:58
 msgid "This workflow is disabled so it cannot be assigned to any pages."
 msgstr ""
 
-#: templates/wagtailadmin/workflows/edit_task.html:40
+#: templates/wagtailadmin/workflows/edit_task.html:42
 msgid "Used on the following active workflows"
 msgstr ""
 
-#: templates/wagtailadmin/workflows/edit_task.html:43
+#: templates/wagtailadmin/workflows/edit_task.html:45
 #: templates/wagtailadmin/workflows/task_chooser/includes/results.html:50
 #: templates/wagtailadmin/workflows/task_index.html:60
 msgid "Not used"
@@ -2505,38 +2551,38 @@ msgid "See full history"
 msgstr ""
 
 #: templates/wagtailadmin/workflows/workflow_status.html:56
-#: views/pages/edit.py:165
+#: views/pages/edit.py:264
 msgid "Compare with live version"
 msgstr ""
 
-#: templatetags/wagtailadmin_tags.py:313
+#: templatetags/wagtailadmin_tags.py:346
 #, python-format
 msgid ""
 "Sort the order of child pages within '%(parent)s' by '%(label)s' in "
 "ascending order."
 msgstr ""
 
-#: templatetags/wagtailadmin_tags.py:314
+#: templatetags/wagtailadmin_tags.py:347
 #, python-format
 msgid ""
 "Sort the order of child pages within '%(parent)s' by '%(label)s' in "
 "descending order."
 msgstr ""
 
-#: templatetags/wagtailadmin_tags.py:554
+#: templatetags/wagtailadmin_tags.py:587
 msgid "0 minutes"
 msgstr ""
 
-#: templatetags/wagtailadmin_tags.py:555
+#: templatetags/wagtailadmin_tags.py:588
 msgid "Just now"
 msgstr ""
 
-#: tests/pages/test_create_page.py:688 tests/pages/test_edit_page.py:924
+#: tests/pages/test_create_page.py:700 tests/pages/test_edit_page.py:936
 #: tests/pages/test_unpublish_page.py:129
 msgid "live"
 msgstr ""
 
-#: tests/pages/test_create_page.py:712 tests/pages/test_edit_page.py:947
+#: tests/pages/test_create_page.py:724 tests/pages/test_edit_page.py:959
 msgid "live + draft"
 msgstr ""
 
@@ -2548,39 +2594,39 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: views/account.py:61
+#: views/account.py:62
 msgid "Profile"
 msgstr ""
 
-#: views/account.py:62 views/account.py:134
+#: views/account.py:63 views/account.py:135
 msgid "Notifications"
 msgstr ""
 
-#: views/account.py:118
+#: views/account.py:119
 msgid "Name and Email"
 msgstr ""
 
-#: views/account.py:125
+#: views/account.py:126
 msgid "Profile picture"
 msgstr ""
 
-#: views/account.py:152
+#: views/account.py:153
 msgid "Locale"
 msgstr ""
 
-#: views/account.py:163
+#: views/account.py:164
 msgid "Password"
 msgstr ""
 
-#: views/account.py:238
+#: views/account.py:240
 msgid "Your account settings have been changed successfully!"
 msgstr ""
 
-#: views/account.py:323
+#: views/account.py:330
 msgid "You have been successfully logged out."
 msgstr ""
 
-#: views/collections.py:19 wagtail_hooks.py:101
+#: views/collections.py:19 wagtail_hooks.py:123
 msgid "Collections"
 msgstr ""
 
@@ -2625,7 +2671,7 @@ msgid "Editing"
 msgstr ""
 
 #: views/pages/convert_alias.py:51
-msgid "Page '{0}' has been converted into a regular page."
+msgid "Page '{0}' has been converted into an ordinary page."
 msgstr ""
 
 #: views/pages/copy.py:79
@@ -2636,12 +2682,12 @@ msgstr ""
 msgid "Page '{0}' copied."
 msgstr ""
 
-#: views/pages/create.py:124 views/pages/edit.py:155 wagtail_hooks.py:139
+#: views/pages/create.py:124 views/pages/edit.py:254 wagtail_hooks.py:167
 msgid "View draft"
 msgstr ""
 
-#: views/pages/create.py:128 views/pages/edit.py:160
-#: views/pages/moderation.py:27 wagtail_hooks.py:149
+#: views/pages/create.py:128 views/pages/edit.py:259
+#: views/pages/moderation.py:27 wagtail_hooks.py:177
 msgid "View live"
 msgstr ""
 
@@ -2681,74 +2727,78 @@ msgstr ""
 msgid "Page '{0}' has been updated."
 msgstr ""
 
-#: views/pages/edit.py:229
+#: views/pages/edit.py:332
 msgid "<b>Page '{}' was locked</b> by <b>you</b> on <b>{}</b>."
 msgstr ""
 
-#: views/pages/edit.py:231
+#: views/pages/edit.py:334
 msgid "<b>Page '{}' is locked</b> by <b>you</b>."
 msgstr ""
 
-#: views/pages/edit.py:244
+#: views/pages/edit.py:347
 msgid "<b>Page '{}' was locked</b> by <b>{}</b> on <b>{}</b>."
 msgstr ""
 
-#: views/pages/edit.py:247
+#: views/pages/edit.py:350
 msgid "<b>Page '{}' is locked</b>."
 msgstr ""
 
-#: views/pages/edit.py:267
+#: views/pages/edit.py:370
 msgid "This page is currently awaiting moderation."
 msgstr ""
 
-#: views/pages/edit.py:270
+#: views/pages/edit.py:373
 msgid "This page is awaiting <b>'{}'</b> in the <b>'{}'</b> workflow."
 msgstr ""
 
-#: views/pages/edit.py:274
+#: views/pages/edit.py:377
 msgid "Only reviewers for this task can edit the page."
 msgstr ""
 
-#: views/pages/edit.py:288
+#: views/pages/edit.py:391
 msgid "Workflow on page '{0}' has been cancelled."
 msgstr ""
 
-#: views/pages/edit.py:405
+#: views/pages/edit.py:514
 msgid "Version from {0} of page '{1}' has been scheduled for publishing."
 msgstr ""
 
-#: views/pages/edit.py:413
+#: views/pages/edit.py:522
 msgid "Page '{0}' is live and this version has been scheduled for publishing."
 msgstr ""
 
-#: views/pages/edit.py:420
+#: views/pages/edit.py:529
 msgid "Page '{0}' has been scheduled for publishing."
 msgstr ""
 
-#: views/pages/edit.py:432
+#: views/pages/edit.py:541
 msgid "Version from {0} of page '{1}' has been published."
 msgstr ""
 
-#: views/pages/edit.py:439
+#: views/pages/edit.py:548
 msgid "Page '{0}' has been published."
 msgstr ""
 
-#: views/pages/edit.py:479
+#: views/pages/edit.py:591
 msgid "Page '{0}' has been submitted for moderation."
 msgstr ""
 
-#: views/pages/edit.py:514
+#: views/pages/edit.py:631
 msgid "Workflow on page '{0}' has been restarted."
 msgstr ""
 
-#: views/pages/edit.py:600
+#: views/pages/edit.py:727
 msgid "The page could not be saved as it is locked"
 msgstr ""
 
-#: views/pages/edit.py:603
+#: views/pages/edit.py:730
 msgid "The page could not be saved due to validation errors"
 msgstr ""
 
+#: views/pages/history.py:24 views/reports/audit_logging.py:20
+msgid "Hide commenting actions"
+msgstr ""
+
 #: views/pages/lock.py:51
 msgid "Page '{0}' is now unlocked."
 msgstr ""
@@ -2815,52 +2865,60 @@ msgstr ""
 msgid "The page '{0}' is not currently awaiting moderation in task '{1}'."
 msgstr ""
 
-#: views/reports.py:70
-msgid "Locked pages"
-msgstr ""
-
-#: views/reports.py:99 views/workflows.py:39 views/workflows.py:349
-#: wagtail_hooks.py:120 wagtail_hooks.py:618
-msgid "Workflows"
-msgstr ""
-
-#: views/reports.py:104 views/reports.py:137
-msgid "Page ID"
-msgstr ""
-
-#: views/reports.py:105 views/reports.py:138
-msgid "Page Type"
-msgstr ""
-
-#: views/reports.py:106 views/reports.py:139
-msgid "Page Title"
-msgstr ""
-
-#: views/reports.py:132 views/workflows.py:310 wagtail_hooks.py:125
-#: wagtail_hooks.py:623
-msgid "Workflow tasks"
-msgstr ""
-
-#: views/reports.py:141
-msgid "Requested By"
-msgstr ""
-
-#: views/reports.py:167 wagtail_hooks.py:628
+#: views/reports/audit_logging.py:44 wagtail_hooks.py:660
 msgid "Site history"
 msgstr ""
 
-#: views/reports.py:172
+#: views/reports/audit_logging.py:49
 msgid "ID"
 msgstr ""
 
-#: views/reports.py:175
+#: views/reports/audit_logging.py:52
 msgid "Action type"
 msgstr ""
 
-#: views/reports.py:176
+#: views/reports/audit_logging.py:53
 msgid "Date/Time"
 msgstr ""
 
+#: views/reports/locked_pages.py:24
+msgid "Locked pages"
+msgstr ""
+
+#: views/reports/workflows.py:25 views/reports/workflows.py:61
+msgid "Show"
+msgstr ""
+
+#: views/reports/workflows.py:28 views/reports/workflows.py:64
+msgid "Awaiting my review"
+msgstr ""
+
+#: views/reports/workflows.py:82 views/workflows.py:39 views/workflows.py:349
+#: wagtail_hooks.py:148 wagtail_hooks.py:650
+msgid "Workflows"
+msgstr ""
+
+#: views/reports/workflows.py:87 views/reports/workflows.py:120
+msgid "Page ID"
+msgstr ""
+
+#: views/reports/workflows.py:88 views/reports/workflows.py:121
+msgid "Page Type"
+msgstr ""
+
+#: views/reports/workflows.py:89 views/reports/workflows.py:122
+msgid "Page Title"
+msgstr ""
+
+#: views/reports/workflows.py:115 views/workflows.py:310 wagtail_hooks.py:153
+#: wagtail_hooks.py:655
+msgid "Workflow tasks"
+msgstr ""
+
+#: views/reports/workflows.py:124
+msgid "Requested By"
+msgstr ""
+
 #: views/workflows.py:40
 msgid "Add a workflow"
 msgstr ""
@@ -2964,111 +3022,111 @@ msgstr ""
 msgid "Report this error to your webmaster with the following information:"
 msgstr ""
 
-#: wagtail_hooks.py:134
+#: wagtail_hooks.py:162
 #, python-format
 msgid "Edit '%(title)s'"
 msgstr ""
 
-#: wagtail_hooks.py:142
+#: wagtail_hooks.py:170
 #, python-format
 msgid "Preview draft version of '%(title)s'"
 msgstr ""
 
-#: wagtail_hooks.py:153
+#: wagtail_hooks.py:181
 #, python-format
 msgid "View live version of '%(title)s'"
 msgstr ""
 
-#: wagtail_hooks.py:163 wagtail_hooks.py:172
+#: wagtail_hooks.py:191 wagtail_hooks.py:200
 #, python-format
 msgid "Add a child page to '%(title)s' "
 msgstr ""
 
-#: wagtail_hooks.py:177
+#: wagtail_hooks.py:205
 msgid "More"
 msgstr ""
 
-#: wagtail_hooks.py:185
+#: wagtail_hooks.py:213
 #, python-format
 msgid "View more options for '%(title)s'"
 msgstr ""
 
-#: wagtail_hooks.py:197
+#: wagtail_hooks.py:225
 #, python-format
 msgid "Move page '%(title)s'"
 msgstr ""
 
-#: wagtail_hooks.py:208
+#: wagtail_hooks.py:236
 #, python-format
 msgid "Copy page '%(title)s'"
 msgstr ""
 
-#: wagtail_hooks.py:219
+#: wagtail_hooks.py:252
 #, python-format
 msgid "Delete page '%(title)s'"
 msgstr ""
 
-#: wagtail_hooks.py:230
+#: wagtail_hooks.py:263
 #, python-format
 msgid "Unpublish page '%(title)s'"
 msgstr ""
 
-#: wagtail_hooks.py:238
+#: wagtail_hooks.py:270
 #, python-format
 msgid "View page history for '%(title)s'"
 msgstr ""
 
-#: wagtail_hooks.py:338 wagtail_hooks.py:353 wagtail_hooks.py:368
-#: wagtail_hooks.py:383 wagtail_hooks.py:398 wagtail_hooks.py:413
+#: wagtail_hooks.py:370 wagtail_hooks.py:385 wagtail_hooks.py:400
+#: wagtail_hooks.py:415 wagtail_hooks.py:430 wagtail_hooks.py:445
 #, python-format
 msgid "Heading %(level)d"
 msgstr ""
 
-#: wagtail_hooks.py:428
+#: wagtail_hooks.py:460
 msgid "Bulleted list"
 msgstr ""
 
-#: wagtail_hooks.py:444
+#: wagtail_hooks.py:476
 msgid "Numbered list"
 msgstr ""
 
-#: wagtail_hooks.py:460
+#: wagtail_hooks.py:492
 msgid "Blockquote"
 msgstr ""
 
-#: wagtail_hooks.py:476
+#: wagtail_hooks.py:508
 msgid "Bold"
 msgstr ""
 
-#: wagtail_hooks.py:492
+#: wagtail_hooks.py:524
 msgid "Italic"
 msgstr ""
 
-#: wagtail_hooks.py:509
+#: wagtail_hooks.py:541
 msgid "Link"
 msgstr ""
 
-#: wagtail_hooks.py:534
+#: wagtail_hooks.py:566
 msgid "Superscript"
 msgstr ""
 
-#: wagtail_hooks.py:549
+#: wagtail_hooks.py:581
 msgid "Subscript"
 msgstr ""
 
-#: wagtail_hooks.py:564
+#: wagtail_hooks.py:596
 msgid "Strikethrough"
 msgstr ""
 
-#: wagtail_hooks.py:579
+#: wagtail_hooks.py:611
 msgid "Code"
 msgstr ""
 
-#: wagtail_hooks.py:613
+#: wagtail_hooks.py:645
 msgid "Locked Pages"
 msgstr ""
 
-#: wagtail_hooks.py:634
+#: wagtail_hooks.py:666
 msgid "Reports"
 msgstr ""
 
diff --git a/wagtail/contrib/forms/locale/en/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/en/LC_MESSAGES/django.po
index cba74e8645..98052ab888 100644
--- a/wagtail/contrib/forms/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/contrib/forms/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/wagtail/contrib/modeladmin/locale/en/LC_MESSAGES/django.po b/wagtail/contrib/modeladmin/locale/en/LC_MESSAGES/django.po
index 1a12ac0368..3129ad3972 100644
--- a/wagtail/contrib/modeladmin/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/contrib/modeladmin/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Parent page"
 msgstr ""
 
-#: helpers/button.py:42 views.py:733
+#: helpers/button.py:42 views.py:729
 #, python-format
 msgid "Add %s"
 msgstr ""
@@ -44,7 +44,7 @@ msgstr ""
 msgid "Inspect this %s"
 msgstr ""
 
-#: helpers/button.py:70 views.py:192
+#: helpers/button.py:70 views.py:188
 msgid "Edit"
 msgstr ""
 
@@ -53,7 +53,7 @@ msgstr ""
 msgid "Edit this %s"
 msgstr ""
 
-#: helpers/button.py:84 templates/modeladmin/edit.html:15 views.py:764
+#: helpers/button.py:84 templates/modeladmin/edit.html:15 views.py:760
 msgid "Delete"
 msgstr ""
 
@@ -210,66 +210,66 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: views.py:185
+#: views.py:181
 #, python-format
 msgid "%(model_name)s '%(instance)s' created."
 msgstr ""
 
-#: views.py:197
+#: views.py:193
 #, python-format
 msgid "The %s could not be created due to errors."
 msgstr ""
 
-#: views.py:654
+#: views.py:650
 msgid "New"
 msgstr ""
 
-#: views.py:679
+#: views.py:675
 #, python-format
 msgid "Create new %s"
 msgstr ""
 
-#: views.py:689
+#: views.py:685
 msgid "Editing"
 msgstr ""
 
-#: views.py:703
+#: views.py:699
 #, python-format
 msgid "Editing %s"
 msgstr ""
 
-#: views.py:706
+#: views.py:702
 #, python-format
 msgid "%(model_name)s '%(instance)s' updated."
 msgstr ""
 
-#: views.py:720
+#: views.py:716
 #, python-format
 msgid "The %s could not be saved due to errors."
 msgstr ""
 
-#: views.py:780
+#: views.py:776
 #, python-format
 msgid "Confirm deletion of %s"
 msgstr ""
 
-#: views.py:784
+#: views.py:780
 #, python-format
 msgid ""
 "Are you sure you want to delete this %s? If other things in your site are "
 "related to it, they may also be affected."
 msgstr ""
 
-#: views.py:793
+#: views.py:789
 #, python-format
 msgid "%(model_name)s '%(instance)s' deleted."
 msgstr ""
 
-#: views.py:829
+#: views.py:825
 msgid "Inspecting"
 msgstr ""
 
-#: views.py:842
+#: views.py:838
 #, python-format
 msgid "Inspecting %s"
 msgstr ""
diff --git a/wagtail/contrib/redirects/locale/en/LC_MESSAGES/django.po b/wagtail/contrib/redirects/locale/en/LC_MESSAGES/django.po
index 9985cade11..be7f11b910 100644
--- a/wagtail/contrib/redirects/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/contrib/redirects/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/wagtail/contrib/search_promotions/locale/en/LC_MESSAGES/django.po b/wagtail/contrib/search_promotions/locale/en/LC_MESSAGES/django.po
index acaa531aec..453d350a06 100644
--- a/wagtail/contrib/search_promotions/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/contrib/search_promotions/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/wagtail/contrib/settings/locale/en/LC_MESSAGES/django.po b/wagtail/contrib/settings/locale/en/LC_MESSAGES/django.po
index 033e0663c2..49c2e507fc 100644
--- a/wagtail/contrib/settings/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/contrib/settings/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/wagtail/contrib/simple_translation/locale/en/LC_MESSAGES/django.po b/wagtail/contrib/simple_translation/locale/en/LC_MESSAGES/django.po
index ab61a33d2a..26186e28ba 100644
--- a/wagtail/contrib/simple_translation/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/contrib/simple_translation/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-21 09:32+0100\n"
+"POT-Creation-Date: 2021-07-13 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,25 +22,38 @@ msgstr ""
 msgid "Wagtail simple translation"
 msgstr ""
 
-#: forms.py:10
+#: forms.py:23
 msgid "Select all"
 msgstr ""
 
-#: forms.py:12
+#: forms.py:25
 msgid "Locales"
 msgstr ""
 
-#: forms.py:17
+#: forms.py:30
 msgid "All child pages will be created."
 msgstr ""
 
-#: forms.py:31
+#: forms.py:45
 msgid "Include subtree ({} page)"
 msgid_plural "Include subtree ({} pages)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/simple_translation/admin/submit_translation.html:25
+#: forms.py:92
+msgid "A locale is disabled because a parent page is not translated."
+msgid_plural ""
+"Some locales are disabled because some parent pages are not translated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms.py:99
+msgid "Translate the parent page."
+msgid_plural "Translate the parent pages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/simple_translation/admin/submit_translation.html:26
 msgid "Submit"
 msgstr ""
 
diff --git a/wagtail/contrib/styleguide/locale/en/LC_MESSAGES/django.po b/wagtail/contrib/styleguide/locale/en/LC_MESSAGES/django.po
index 5fe401463e..953d2460c7 100644
--- a/wagtail/contrib/styleguide/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/contrib/styleguide/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/wagtail/contrib/table_block/locale/en/LC_MESSAGES/django.po b/wagtail/contrib/table_block/locale/en/LC_MESSAGES/django.po
index 534cf7dac4..4e85cceafb 100644
--- a/wagtail/contrib/table_block/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/contrib/table_block/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/wagtail/core/locale/en/LC_MESSAGES/django.po b/wagtail/core/locale/en/LC_MESSAGES/django.po
index ea3988dbf2..ab7f6e87ca 100644
--- a/wagtail/core/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/core/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Add Comment"
 msgstr ""
 
-#: blocks/list_block.py:173 blocks/stream_block.py:641
+#: blocks/list_block.py:184 blocks/stream_block.py:594
 msgid "Move up"
 msgstr ""
 
-#: blocks/list_block.py:174 blocks/stream_block.py:642
+#: blocks/list_block.py:185 blocks/stream_block.py:595
 msgid "Move down"
 msgstr ""
 
-#: blocks/list_block.py:175 blocks/stream_block.py:643
+#: blocks/list_block.py:186 blocks/stream_block.py:596
 msgid "Duplicate"
 msgstr ""
 
-#: blocks/list_block.py:176 blocks/stream_block.py:644 wagtail_hooks.py:102
+#: blocks/list_block.py:187 blocks/stream_block.py:597 wagtail_hooks.py:103
 msgid "Delete"
 msgstr ""
 
-#: blocks/list_block.py:177 blocks/stream_block.py:645 models.py:3166
+#: blocks/list_block.py:188 blocks/stream_block.py:598 models/__init__.py:2650
 msgid "Add"
 msgstr ""
 
@@ -54,16 +54,16 @@ msgstr ""
 msgid "This block has no options."
 msgstr ""
 
-#: blocks/stream_block.py:146 blocks/stream_block.py:168
+#: blocks/stream_block.py:144 blocks/stream_block.py:166
 #, python-format
 msgid "The minimum number of items is %d"
 msgstr ""
 
-#: blocks/stream_block.py:149
+#: blocks/stream_block.py:147
 msgid "This field is required."
 msgstr ""
 
-#: blocks/stream_block.py:153 blocks/stream_block.py:172
+#: blocks/stream_block.py:151 blocks/stream_block.py:170
 #, python-format
 msgid "The maximum number of items is %d"
 msgstr ""
@@ -80,591 +80,593 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: log_actions.py:52
+#: log_actions.py:61
 #, python-format
 msgid "Unknown %(action)s"
 msgstr ""
 
-#: models.py:176
+#: models/__init__.py:184
+msgid "title"
+msgstr ""
+
+#: models/__init__.py:186
+msgid "The page title as you'd like it to be seen by the public"
+msgstr ""
+
+#: models/__init__.py:194
+msgid "slug"
+msgstr ""
+
+#: models/__init__.py:197
+msgid ""
+"The name of the page as it will appear in URLs e.g http://domain.com/blog/"
+"[my-slug]/"
+msgstr ""
+
+#: models/__init__.py:201 models/__init__.py:3194 models/__init__.py:3802
+#: models/audit_log.py:82
+msgid "content type"
+msgstr ""
+
+#: models/__init__.py:205 models/__init__.py:1457
+msgid "live"
+msgstr ""
+
+#: models/__init__.py:207
+msgid "has unpublished changes"
+msgstr ""
+
+#: models/__init__.py:211
+msgid "URL path"
+msgstr ""
+
+#: models/__init__.py:214
+msgid "owner"
+msgstr ""
+
+#: models/__init__.py:223
+msgid "title tag"
+msgstr ""
+
+#: models/__init__.py:226
+msgid ""
+"The name of the page displayed on search engine results as the clickable "
+"headline."
+msgstr ""
+
+#: models/__init__.py:231
+msgid "show in menus"
+msgstr ""
+
+#: models/__init__.py:233
+msgid ""
+"Whether a link to this page will appear in automatically generated menus"
+msgstr ""
+
+#: models/__init__.py:236
+msgid "meta description"
+msgstr ""
+
+#: models/__init__.py:238
+msgid ""
+"The descriptive text displayed underneath a headline in search engine "
+"results."
+msgstr ""
+
+#: models/__init__.py:242
+msgid "go live date/time"
+msgstr ""
+
+#: models/__init__.py:247
+msgid "expiry date/time"
+msgstr ""
+
+#: models/__init__.py:251 models/__init__.py:1442
+msgid "expired"
+msgstr ""
+
+#: models/__init__.py:253
+msgid "locked"
+msgstr ""
+
+#: models/__init__.py:254
+msgid "locked at"
+msgstr ""
+
+#: models/__init__.py:257
+msgid "locked by"
+msgstr ""
+
+#: models/__init__.py:266
+msgid "first published at"
+msgstr ""
+
+#: models/__init__.py:272
+msgid "last published at"
+msgstr ""
+
+#: models/__init__.py:277
+msgid "latest revision created at"
+msgstr ""
+
+#: models/__init__.py:284
+msgid "live revision"
+msgstr ""
+
+#: models/__init__.py:445
+msgid "This slug is already in use"
+msgstr ""
+
+#: models/__init__.py:1444
+msgid "scheduled"
+msgstr ""
+
+#: models/__init__.py:1446
+msgid "in moderation"
+msgstr ""
+
+#: models/__init__.py:1448
+msgid "draft"
+msgstr ""
+
+#: models/__init__.py:1451
+msgid "live + scheduled"
+msgstr ""
+
+#: models/__init__.py:1453
+msgid "live + in moderation"
+msgstr ""
+
+#: models/__init__.py:1455
+msgid "live + draft"
+msgstr ""
+
+#: models/__init__.py:2063
+msgid "Default"
+msgstr ""
+
+#: models/__init__.py:2368 models/__init__.py:2388 models/__init__.py:2666
+#: models/__init__.py:3085 models/__init__.py:3142 models/__init__.py:3493
+msgid "page"
+msgstr ""
+
+#: models/__init__.py:2369
+msgid "pages"
+msgstr ""
+
+#: models/__init__.py:2390
+msgid "submitted for moderation"
+msgstr ""
+
+#: models/__init__.py:2394 models/__init__.py:3496
+msgid "created at"
+msgstr ""
+
+#: models/__init__.py:2396
+msgid "user"
+msgstr ""
+
+#: models/__init__.py:2399
+msgid "content JSON"
+msgstr ""
+
+#: models/__init__.py:2401
+msgid "approved go live at"
+msgstr ""
+
+#: models/__init__.py:2645 models/__init__.py:3786
+msgid "page revision"
+msgstr ""
+
+#: models/__init__.py:2646
+msgid "page revisions"
+msgstr ""
+
+#: models/__init__.py:2650
+msgid "Add/edit pages you own"
+msgstr ""
+
+#: models/__init__.py:2651
+msgid "Edit"
+msgstr ""
+
+#: models/__init__.py:2651
+msgid "Edit any page"
+msgstr ""
+
+#: models/__init__.py:2652 wagtail_hooks.py:104
+msgid "Publish"
+msgstr ""
+
+#: models/__init__.py:2652
+msgid "Publish any page"
+msgstr ""
+
+#: models/__init__.py:2653
+msgid "Bulk delete"
+msgstr ""
+
+#: models/__init__.py:2653
+msgid "Delete pages with children"
+msgstr ""
+
+#: models/__init__.py:2654 wagtail_hooks.py:108
+msgid "Lock"
+msgstr ""
+
+#: models/__init__.py:2654
+msgid "Lock/unlock pages you've locked"
+msgstr ""
+
+#: models/__init__.py:2655 wagtail_hooks.py:109
+msgid "Unlock"
+msgstr ""
+
+#: models/__init__.py:2655
+msgid "Unlock any page"
+msgstr ""
+
+#: models/__init__.py:2665 models/collections.py:141
+msgid "group"
+msgstr ""
+
+#: models/__init__.py:2668
+msgid "permission type"
+msgstr ""
+
+#: models/__init__.py:2675
+msgid "group page permission"
+msgstr ""
+
+#: models/__init__.py:2676
+msgid "group page permissions"
+msgstr ""
+
+#: models/__init__.py:3091
+msgid "page view restriction"
+msgstr ""
+
+#: models/__init__.py:3092
+msgid "page view restrictions"
+msgstr ""
+
+#: models/__init__.py:3150 models/__init__.py:3412 models/__init__.py:3494
+msgid "workflow"
+msgstr ""
+
+#: models/__init__.py:3169
+msgid "workflow page"
+msgstr ""
+
+#: models/__init__.py:3170
+msgid "workflow pages"
+msgstr ""
+
+#: models/__init__.py:3174
+msgid "workflow_tasks"
+msgstr ""
+
+#: models/__init__.py:3176 models/__init__.py:3335 models/__init__.py:3787
+msgid "task"
+msgstr ""
+
+#: models/__init__.py:3181
+msgid "workflow task order"
+msgstr ""
+
+#: models/__init__.py:3182
+msgid "workflow task orders"
+msgstr ""
+
+#: models/__init__.py:3191 models/__init__.py:3345 models/collections.py:42
+msgid "name"
+msgstr ""
+
+#: models/__init__.py:3198 models/__init__.py:3346
+msgid "active"
+msgstr ""
+
+#: models/__init__.py:3199
+msgid ""
+"Active tasks can be added to workflows. Deactivating a task does not remove "
+"it from existing workflows."
+msgstr ""
+
+#: models/__init__.py:3336
+msgid "tasks"
+msgstr ""
+
+#: models/__init__.py:3347
+msgid ""
+"Active workflows can be added to pages. Deactivating a workflow does not "
+"remove it from existing pages."
+msgstr ""
+
+#: models/__init__.py:3413
+msgid "workflows"
+msgstr ""
+
+#: models/__init__.py:3417 models/view_restrictions.py:30
+msgid "groups"
+msgstr ""
+
+#: models/__init__.py:3417
+msgid ""
+"Pages at this step in a workflow will be moderated or approved by these "
+"groups of users"
+msgstr ""
+
+#: models/__init__.py:3450
+msgid "Request changes"
+msgstr ""
+
+#: models/__init__.py:3451 wagtail_hooks.py:110
+msgid "Approve"
+msgstr ""
+
+#: models/__init__.py:3452
+msgid "Approve with comment"
+msgstr ""
+
+#: models/__init__.py:3465
+msgid "Members of the chosen Wagtail Groups can approve this task"
+msgstr ""
+
+#: models/__init__.py:3468
+msgid "Group approval task"
+msgstr ""
+
+#: models/__init__.py:3469
+msgid "Group approval tasks"
+msgstr ""
+
+#: models/__init__.py:3487 models/__init__.py:3778
+msgid "In progress"
+msgstr ""
+
+#: models/__init__.py:3488 models/__init__.py:3779 wagtail_hooks.py:110
+msgid "Approved"
+msgstr ""
+
+#: models/__init__.py:3489
+msgid "Needs changes"
+msgstr ""
+
+#: models/__init__.py:3490 models/__init__.py:3782
+msgid "Cancelled"
+msgstr ""
+
+#: models/__init__.py:3495 models/__init__.py:3788
+msgid "status"
+msgstr ""
+
+#: models/__init__.py:3498
+msgid "requested by"
+msgstr ""
+
+#: models/__init__.py:3505
+msgid "current task state"
+msgstr ""
+
+#: models/__init__.py:3518
+msgid ""
+"There may only be one in progress or needs changes workflow state per page."
+msgstr ""
+
+#: models/__init__.py:3525
+msgid "Workflow '{0}' on Page '{1}': {2}"
+msgstr ""
+
+#: models/__init__.py:3705
+msgid "Not started"
+msgstr ""
+
+#: models/__init__.py:3753
+msgid "Workflow state"
+msgstr ""
+
+#: models/__init__.py:3754
+msgid "Workflow states"
+msgstr ""
+
+#: models/__init__.py:3780 wagtail_hooks.py:111
+msgid "Rejected"
+msgstr ""
+
+#: models/__init__.py:3781
+msgid "Skipped"
+msgstr ""
+
+#: models/__init__.py:3785
+msgid "workflow state"
+msgstr ""
+
+#: models/__init__.py:3789
+msgid "started at"
+msgstr ""
+
+#: models/__init__.py:3790
+msgid "finished at"
+msgstr ""
+
+#: models/__init__.py:3793
+msgid "finished by"
+msgstr ""
+
+#: models/__init__.py:3822
+msgid "Task '{0}' on Page Revision '{1}': {2}"
+msgstr ""
+
+#: models/__init__.py:3959
+msgid "Task state"
+msgstr ""
+
+#: models/__init__.py:3960
+msgid "Task states"
+msgstr ""
+
+#: models/__init__.py:3996
+msgid "page log entry"
+msgstr ""
+
+#: models/__init__.py:3997
+msgid "page log entries"
+msgstr ""
+
+#: models/__init__.py:4039
+msgid "comment"
+msgstr ""
+
+#: models/__init__.py:4040
+msgid "comments"
+msgstr ""
+
+#: models/__init__.py:4097
+msgid "comment reply"
+msgstr ""
+
+#: models/__init__.py:4098
+msgid "comment replies"
+msgstr ""
+
+#: models/audit_log.py:90
+msgid "timestamp (UTC)"
+msgstr ""
+
+#: models/audit_log.py:111
+msgid "log entry"
+msgstr ""
+
+#: models/audit_log.py:112
+msgid "log entries"
+msgstr ""
+
+#: models/audit_log.py:123
+msgid "The log action '{}' has not been registered."
+msgstr ""
+
+#: models/audit_log.py:142
+#, python-format
+msgid "user %(id)d (deleted)"
+msgstr ""
+
+#: models/audit_log.py:151
+msgid "system"
+msgstr ""
+
+#: models/collections.py:26 models/collections.py:99 models/collections.py:114
+#: models/collections.py:147
+msgid "collection"
+msgstr ""
+
+#: models/collections.py:34
+msgid "collection view restriction"
+msgstr ""
+
+#: models/collections.py:35
+msgid "collection view restrictions"
+msgstr ""
+
+#: models/collections.py:100
+msgid "collections"
+msgstr ""
+
+#: models/collections.py:153
+msgid "permission"
+msgstr ""
+
+#: models/collections.py:171
+msgid "group collection permission"
+msgstr ""
+
+#: models/collections.py:172
+msgid "group collection permissions"
+msgstr ""
+
+#: models/sites.py:26
 msgid "hostname"
 msgstr ""
 
-#: models.py:178
+#: models/sites.py:28
 msgid "port"
 msgstr ""
 
-#: models.py:181
+#: models/sites.py:31
 msgid ""
 "Set this to something other than 80 if you need a specific port number to "
 "appear in URLs (e.g. development on port 8000). Does not affect request "
 "handling (so port forwarding still works)."
 msgstr ""
 
-#: models.py:186
+#: models/sites.py:36
 msgid "site name"
 msgstr ""
 
-#: models.py:189
+#: models/sites.py:39
 msgid "Human-readable name for the site."
 msgstr ""
 
-#: models.py:191
+#: models/sites.py:41
 msgid "root page"
 msgstr ""
 
-#: models.py:194
+#: models/sites.py:44
 msgid "is default site"
 msgstr ""
 
-#: models.py:197
+#: models/sites.py:47
 msgid ""
 "If true, this site will handle requests for all other hostnames that do not "
 "have a site entry of their own"
 msgstr ""
 
-#: models.py:205
+#: models/sites.py:55
 msgid "site"
 msgstr ""
 
-#: models.py:206
+#: models/sites.py:56
 msgid "sites"
 msgstr ""
 
-#: models.py:212
+#: models/sites.py:62
 msgid "default"
 msgstr ""
 
-#: models.py:286
+#: models/sites.py:136
 #, python-format
 msgid ""
 "%(hostname)s is already configured as the default site. You must unset that "
 "before you can save this site as default."
 msgstr ""
 
-#: models.py:739
-msgid "title"
-msgstr ""
-
-#: models.py:741
-msgid "The page title as you'd like it to be seen by the public"
-msgstr ""
-
-#: models.py:749
-msgid "slug"
-msgstr ""
-
-#: models.py:752
-msgid ""
-"The name of the page as it will appear in URLs e.g http://domain.com/blog/"
-"[my-slug]/"
-msgstr ""
-
-#: models.py:756 models.py:3932 models.py:4540 models.py:4755
-msgid "content type"
-msgstr ""
-
-#: models.py:760 models.py:2005
-msgid "live"
-msgstr ""
-
-#: models.py:762
-msgid "has unpublished changes"
-msgstr ""
-
-#: models.py:766
-msgid "URL path"
-msgstr ""
-
-#: models.py:769
-msgid "owner"
-msgstr ""
-
-#: models.py:778
-msgid "title tag"
-msgstr ""
-
-#: models.py:781
-msgid ""
-"The name of the page displayed on search engine results as the clickable "
-"headline."
-msgstr ""
-
-#: models.py:786
-msgid "show in menus"
-msgstr ""
-
-#: models.py:788
-msgid ""
-"Whether a link to this page will appear in automatically generated menus"
-msgstr ""
-
-#: models.py:791
-msgid "meta description"
-msgstr ""
-
-#: models.py:793
-msgid ""
-"The descriptive text displayed underneath a headline in search engine "
-"results."
-msgstr ""
-
-#: models.py:797
-msgid "go live date/time"
-msgstr ""
-
-#: models.py:802
-msgid "expiry date/time"
-msgstr ""
-
-#: models.py:806 models.py:1990
-msgid "expired"
-msgstr ""
-
-#: models.py:808
-msgid "locked"
-msgstr ""
-
-#: models.py:809
-msgid "locked at"
-msgstr ""
-
-#: models.py:812
-msgid "locked by"
-msgstr ""
-
-#: models.py:821
-msgid "first published at"
-msgstr ""
-
-#: models.py:827
-msgid "last published at"
-msgstr ""
-
-#: models.py:832
-msgid "latest revision created at"
-msgstr ""
-
-#: models.py:839
-msgid "live revision"
-msgstr ""
-
-#: models.py:1000
-msgid "This slug is already in use"
-msgstr ""
-
-#: models.py:1992
-msgid "scheduled"
-msgstr ""
-
-#: models.py:1994
-msgid "in moderation"
-msgstr ""
-
-#: models.py:1996
-msgid "draft"
-msgstr ""
-
-#: models.py:1999
-msgid "live + scheduled"
-msgstr ""
-
-#: models.py:2001
-msgid "live + in moderation"
-msgstr ""
-
-#: models.py:2003
-msgid "live + draft"
-msgstr ""
-
-#: models.py:2606
-msgid "Default"
-msgstr ""
-
-#: models.py:2884 models.py:2904 models.py:3182 models.py:3701 models.py:3880
-#: models.py:4231
-msgid "page"
-msgstr ""
-
-#: models.py:2885
-msgid "pages"
-msgstr ""
-
-#: models.py:2906
-msgid "submitted for moderation"
-msgstr ""
-
-#: models.py:2910 models.py:4234
-msgid "created at"
-msgstr ""
-
-#: models.py:2912
-msgid "user"
-msgstr ""
-
-#: models.py:2915
-msgid "content JSON"
-msgstr ""
-
-#: models.py:2917
-msgid "approved go live at"
-msgstr ""
-
-#: models.py:3161 models.py:4524
-msgid "page revision"
-msgstr ""
-
-#: models.py:3162
-msgid "page revisions"
-msgstr ""
-
-#: models.py:3166
-msgid "Add/edit pages you own"
-msgstr ""
-
-#: models.py:3167
-msgid "Edit"
-msgstr ""
-
-#: models.py:3167
-msgid "Edit any page"
-msgstr ""
-
-#: models.py:3168 wagtail_hooks.py:103
-msgid "Publish"
-msgstr ""
-
-#: models.py:3168
-msgid "Publish any page"
-msgstr ""
-
-#: models.py:3169
-msgid "Bulk delete"
-msgstr ""
-
-#: models.py:3169
-msgid "Delete pages with children"
-msgstr ""
-
-#: models.py:3170 wagtail_hooks.py:107
-msgid "Lock"
-msgstr ""
-
-#: models.py:3170
-msgid "Lock/unlock pages you've locked"
-msgstr ""
-
-#: models.py:3171 wagtail_hooks.py:108
-msgid "Unlock"
-msgstr ""
-
-#: models.py:3171
-msgid "Unlock any page"
-msgstr ""
-
-#: models.py:3181 models.py:3843
-msgid "group"
-msgstr ""
-
-#: models.py:3184
-msgid "permission type"
-msgstr ""
-
-#: models.py:3191
-msgid "group page permission"
-msgstr ""
-
-#: models.py:3192
-msgid "group page permissions"
-msgstr ""
-
-#: models.py:3606
+#: models/view_restrictions.py:21
 msgid "Public"
 msgstr ""
 
-#: models.py:3607
+#: models/view_restrictions.py:22
 msgid "Private, accessible to logged-in users"
 msgstr ""
 
-#: models.py:3608
+#: models/view_restrictions.py:23
 msgid "Private, accessible with the following password"
 msgstr ""
 
-#: models.py:3609
+#: models/view_restrictions.py:24
 msgid "Private, accessible to users in specific groups"
 msgstr ""
 
-#: models.py:3614
+#: models/view_restrictions.py:29
 msgid "password"
 msgstr ""
 
-#: models.py:3615 models.py:4155
-msgid "groups"
-msgstr ""
-
-#: models.py:3653
+#: models/view_restrictions.py:68
 msgid "view restriction"
 msgstr ""
 
-#: models.py:3654
+#: models/view_restrictions.py:69
 msgid "view restrictions"
 msgstr ""
 
-#: models.py:3707
-msgid "page view restriction"
-msgstr ""
-
-#: models.py:3708
-msgid "page view restrictions"
-msgstr ""
-
-#: models.py:3728 models.py:3801 models.py:3816 models.py:3849
-msgid "collection"
-msgstr ""
-
-#: models.py:3736
-msgid "collection view restriction"
-msgstr ""
-
-#: models.py:3737
-msgid "collection view restrictions"
-msgstr ""
-
-#: models.py:3744 models.py:3929 models.py:4083
-msgid "name"
-msgstr ""
-
-#: models.py:3802
-msgid "collections"
-msgstr ""
-
-#: models.py:3855
-msgid "permission"
-msgstr ""
-
-#: models.py:3873
-msgid "group collection permission"
-msgstr ""
-
-#: models.py:3874
-msgid "group collection permissions"
-msgstr ""
-
-#: models.py:3888 models.py:4150 models.py:4232
-msgid "workflow"
-msgstr ""
-
-#: models.py:3907
-msgid "workflow page"
-msgstr ""
-
-#: models.py:3908
-msgid "workflow pages"
-msgstr ""
-
-#: models.py:3912
-msgid "workflow_tasks"
-msgstr ""
-
-#: models.py:3914 models.py:4073 models.py:4525
-msgid "task"
-msgstr ""
-
-#: models.py:3919
-msgid "workflow task order"
-msgstr ""
-
-#: models.py:3920
-msgid "workflow task orders"
-msgstr ""
-
-#: models.py:3936 models.py:4084
-msgid "active"
-msgstr ""
-
-#: models.py:3937
-msgid ""
-"Active tasks can be added to workflows. Deactivating a task does not remove "
-"it from existing workflows."
-msgstr ""
-
-#: models.py:4074
-msgid "tasks"
-msgstr ""
-
-#: models.py:4085
-msgid ""
-"Active workflows can be added to pages. Deactivating a workflow does not "
-"remove it from existing pages."
-msgstr ""
-
-#: models.py:4151
-msgid "workflows"
-msgstr ""
-
-#: models.py:4155
-msgid ""
-"Pages at this step in a workflow will be moderated or approved by these "
-"groups of users"
-msgstr ""
-
-#: models.py:4188
-msgid "Request changes"
-msgstr ""
-
-#: models.py:4189 wagtail_hooks.py:109
-msgid "Approve"
-msgstr ""
-
-#: models.py:4190
-msgid "Approve with comment"
-msgstr ""
-
-#: models.py:4203
-msgid "Members of the chosen Wagtail Groups can approve this task"
-msgstr ""
-
-#: models.py:4206
-msgid "Group approval task"
-msgstr ""
-
-#: models.py:4207
-msgid "Group approval tasks"
-msgstr ""
-
-#: models.py:4225 models.py:4516
-msgid "In progress"
-msgstr ""
-
-#: models.py:4226 models.py:4517 wagtail_hooks.py:109
-msgid "Approved"
-msgstr ""
-
-#: models.py:4227
-msgid "Needs changes"
-msgstr ""
-
-#: models.py:4228 models.py:4520
-msgid "Cancelled"
-msgstr ""
-
-#: models.py:4233 models.py:4526
-msgid "status"
-msgstr ""
-
-#: models.py:4236
-msgid "requested by"
-msgstr ""
-
-#: models.py:4243
-msgid "current task state"
-msgstr ""
-
-#: models.py:4256
-msgid ""
-"There may only be one in progress or needs changes workflow state per page."
-msgstr ""
-
-#: models.py:4263
-msgid "Workflow '{0}' on Page '{1}': {2}"
-msgstr ""
-
-#: models.py:4443
-msgid "Not started"
-msgstr ""
-
-#: models.py:4491
-msgid "Workflow state"
-msgstr ""
-
-#: models.py:4492
-msgid "Workflow states"
-msgstr ""
-
-#: models.py:4518 wagtail_hooks.py:110
-msgid "Rejected"
-msgstr ""
-
-#: models.py:4519
-msgid "Skipped"
-msgstr ""
-
-#: models.py:4523
-msgid "workflow state"
-msgstr ""
-
-#: models.py:4527
-msgid "started at"
-msgstr ""
-
-#: models.py:4528
-msgid "finished at"
-msgstr ""
-
-#: models.py:4531
-msgid "finished by"
-msgstr ""
-
-#: models.py:4560
-msgid "Task '{0}' on Page Revision '{1}': {2}"
-msgstr ""
-
-#: models.py:4697
-msgid "Task state"
-msgstr ""
-
-#: models.py:4698
-msgid "Task states"
-msgstr ""
-
-#: models.py:4763
-msgid "timestamp (UTC)"
-msgstr ""
-
-#: models.py:4784
-msgid "log entry"
-msgstr ""
-
-#: models.py:4785
-msgid "log entries"
-msgstr ""
-
-#: models.py:4796
-msgid "The log action '{}' has not been registered."
-msgstr ""
-
-#: models.py:4815
-#, python-format
-msgid "user %(id)d (deleted)"
-msgstr ""
-
-#: models.py:4824
-msgid "system"
-msgstr ""
-
-#: models.py:4877
-msgid "page log entry"
-msgstr ""
-
-#: models.py:4878
-msgid "page log entries"
-msgstr ""
-
-#: models.py:4920
-msgid "comment"
-msgstr ""
-
-#: models.py:4921
-msgid "comments"
-msgstr ""
-
-#: models.py:4951
-msgid "comment reply"
-msgstr ""
-
-#: models.py:4952
-msgid "comment replies"
-msgstr ""
-
 #: templates/wagtailcore/login.html:5 templates/wagtailcore/login.html:8
 #: templates/wagtailcore/login.html:21
 msgid "Log in"
@@ -705,310 +707,401 @@ msgstr ""
 msgid "German"
 msgstr ""
 
-#: wagtail_hooks.py:90
+#: wagtail_hooks.py:91
 #, python-format
 msgid "%(count)s descendant collection"
 msgid_plural "%(count)s descendant collections"
 msgstr[0] ""
 msgstr[1] ""
 
-#: wagtail_hooks.py:100
+#: wagtail_hooks.py:101
 msgid "Create"
 msgstr ""
 
-#: wagtail_hooks.py:100
+#: wagtail_hooks.py:101
 msgid "Created"
 msgstr ""
 
-#: wagtail_hooks.py:101
+#: wagtail_hooks.py:102
 msgid "Save draft"
 msgstr ""
 
-#: wagtail_hooks.py:101
+#: wagtail_hooks.py:102
 msgid "Draft saved"
 msgstr ""
 
-#: wagtail_hooks.py:102
+#: wagtail_hooks.py:103
 msgid "Deleted"
 msgstr ""
 
-#: wagtail_hooks.py:103
+#: wagtail_hooks.py:104
 msgid "Published"
 msgstr ""
 
-#: wagtail_hooks.py:104
+#: wagtail_hooks.py:105
 msgid "Publish scheduled draft"
 msgstr ""
 
-#: wagtail_hooks.py:104
+#: wagtail_hooks.py:105
 msgid "Published scheduled draft"
 msgstr ""
 
-#: wagtail_hooks.py:105
+#: wagtail_hooks.py:106
 msgid "Unpublish"
 msgstr ""
 
-#: wagtail_hooks.py:105
+#: wagtail_hooks.py:106
 msgid "Unpublished"
 msgstr ""
 
-#: wagtail_hooks.py:106
+#: wagtail_hooks.py:107
 msgid "Unpublish scheduled draft"
 msgstr ""
 
-#: wagtail_hooks.py:106
+#: wagtail_hooks.py:107
 msgid "Unpublished scheduled draft"
 msgstr ""
 
-#: wagtail_hooks.py:107
+#: wagtail_hooks.py:108
 msgid "Locked"
 msgstr ""
 
-#: wagtail_hooks.py:108
+#: wagtail_hooks.py:109
 msgid "Unlocked"
 msgstr ""
 
-#: wagtail_hooks.py:110
+#: wagtail_hooks.py:111
 msgid "Reject"
 msgstr ""
 
-#: wagtail_hooks.py:114
+#: wagtail_hooks.py:115
 #, python-format
 msgid ""
 "Reverted to previous revision with id %(revision_id)s from %(created_at)s"
 msgstr ""
 
-#: wagtail_hooks.py:119
+#: wagtail_hooks.py:120
 msgid "Reverted to previous revision"
 msgstr ""
 
-#: wagtail_hooks.py:123
+#: wagtail_hooks.py:124
 #, python-format
 msgid "Copied from %(title)s"
 msgstr ""
 
-#: wagtail_hooks.py:127
+#: wagtail_hooks.py:128
 msgid "Copied"
 msgstr ""
 
-#: wagtail_hooks.py:131
+#: wagtail_hooks.py:132
 #, python-format
 msgid "Created an alias of %(title)s"
 msgstr ""
 
-#: wagtail_hooks.py:135
+#: wagtail_hooks.py:136
 msgid "Created an alias"
 msgstr ""
 
-#: wagtail_hooks.py:139
+#: wagtail_hooks.py:140
 #, python-format
-msgid "Converted the alias '%(title)s' into a regular page"
+msgid "Converted the alias '%(title)s' into an ordinary page"
 msgstr ""
 
-#: wagtail_hooks.py:143
-msgid "Converted an alias into a regular page"
+#: wagtail_hooks.py:144
+msgid "Converted an alias into an ordinary page"
 msgstr ""
 
-#: wagtail_hooks.py:147
+#: wagtail_hooks.py:148
 #, python-format
 msgid "Moved from '%(old_parent)s' to '%(new_parent)s'"
 msgstr ""
 
-#: wagtail_hooks.py:152
+#: wagtail_hooks.py:153
 msgid "Moved"
 msgstr ""
 
-#: wagtail_hooks.py:156
+#: wagtail_hooks.py:157
 #, python-format
 msgid "Reordered under '%(parent)s'"
 msgstr ""
 
-#: wagtail_hooks.py:160
+#: wagtail_hooks.py:161
 msgid "Reordered"
 msgstr ""
 
-#: wagtail_hooks.py:165
+#: wagtail_hooks.py:166
 #, python-format
 msgid ""
 "Revision %(revision_id)s from %(created_at)s scheduled for publishing at "
 "%(go_live_at)s."
 msgstr ""
 
-#: wagtail_hooks.py:171
+#: wagtail_hooks.py:172
 #, python-format
 msgid "Page scheduled for publishing at %(go_live_at)s"
 msgstr ""
 
-#: wagtail_hooks.py:175
+#: wagtail_hooks.py:176
 msgid "Page scheduled for publishing"
 msgstr ""
 
-#: wagtail_hooks.py:180
+#: wagtail_hooks.py:181
 #, python-format
 msgid ""
 "Revision %(revision_id)s from %(created_at)s unscheduled from publishing at "
 "%(go_live_at)s."
 msgstr ""
 
-#: wagtail_hooks.py:186
+#: wagtail_hooks.py:187
 #, python-format
 msgid "Page unscheduled for publishing at %(go_live_at)s"
 msgstr ""
 
-#: wagtail_hooks.py:190
+#: wagtail_hooks.py:191
 msgid "Page unscheduled from publishing"
 msgstr ""
 
-#: wagtail_hooks.py:194
+#: wagtail_hooks.py:195
 #, python-format
 msgid "Added the '%(restriction)s' view restriction"
 msgstr ""
 
-#: wagtail_hooks.py:198
+#: wagtail_hooks.py:199
 msgid "Added view restriction"
 msgstr ""
 
-#: wagtail_hooks.py:202
+#: wagtail_hooks.py:203
 #, python-format
 msgid "Updated the view restriction to '%(restriction)s'"
 msgstr ""
 
-#: wagtail_hooks.py:206
+#: wagtail_hooks.py:207
 msgid "Updated view restriction"
 msgstr ""
 
-#: wagtail_hooks.py:210
+#: wagtail_hooks.py:211
 #, python-format
 msgid "Removed the '%(restriction)s' view restriction"
 msgstr ""
 
-#: wagtail_hooks.py:214
+#: wagtail_hooks.py:215
 msgid "Removed view restriction"
 msgstr ""
 
-#: wagtail_hooks.py:218
+#: wagtail_hooks.py:219
 #, python-format
 msgid "Renamed from '%(old)s' to '%(new)s'"
 msgstr ""
 
-#: wagtail_hooks.py:223
+#: wagtail_hooks.py:224
 msgid "Renamed"
 msgstr ""
 
-#: wagtail_hooks.py:225
+#: wagtail_hooks.py:237
+#, python-format
+msgid "Added a comment on field %(field)s: \"%(text)s\""
+msgstr ""
+
+#: wagtail_hooks.py:242
+msgid "Added a comment"
+msgstr ""
+
+#: wagtail_hooks.py:248
+#, python-format
+msgid "Edited a comment on field %(field)s: \"%(text)s\""
+msgstr ""
+
+#: wagtail_hooks.py:253
+msgid "Edited a comment"
+msgstr ""
+
+#: wagtail_hooks.py:259
+#, python-format
+msgid "Deleted a comment on field %(field)s: \"%(text)s\""
+msgstr ""
+
+#: wagtail_hooks.py:264
+msgid "Deleted a comment"
+msgstr ""
+
+#: wagtail_hooks.py:270
+#, python-format
+msgid "Resolved a comment on field %(field)s: \"%(text)s\""
+msgstr ""
+
+#: wagtail_hooks.py:275
+msgid "Resolved a comment"
+msgstr ""
+
+#: wagtail_hooks.py:281
+#, python-format
+msgid "Replied to comment on field %(field)s: \"%(text)s\""
+msgstr ""
+
+#: wagtail_hooks.py:286
+msgid "Replied to a comment"
+msgstr ""
+
+#: wagtail_hooks.py:292
+#, python-format
+msgid "Edited a reply to a comment on field %(field)s: \"%(text)s\""
+msgstr ""
+
+#: wagtail_hooks.py:297
+msgid "Edited a reply"
+msgstr ""
+
+#: wagtail_hooks.py:303
+#, python-format
+msgid "Deleted a reply to a comment on field %(field)s: \"%(text)s\""
+msgstr ""
+
+#: wagtail_hooks.py:308
+msgid "Deleted a reply"
+msgstr ""
+
+#: wagtail_hooks.py:312
 msgid "Rename"
 msgstr ""
 
-#: wagtail_hooks.py:226
+#: wagtail_hooks.py:313
 msgid "Revert"
 msgstr ""
 
-#: wagtail_hooks.py:227
+#: wagtail_hooks.py:314
 msgid "Copy"
 msgstr ""
 
-#: wagtail_hooks.py:228
+#: wagtail_hooks.py:315
 msgid "Create alias"
 msgstr ""
 
-#: wagtail_hooks.py:229
-msgid "Convert alias into regular page"
+#: wagtail_hooks.py:316
+msgid "Convert alias into ordinary page"
 msgstr ""
 
-#: wagtail_hooks.py:230
+#: wagtail_hooks.py:317
 msgid "Move"
 msgstr ""
 
-#: wagtail_hooks.py:231
+#: wagtail_hooks.py:318
 msgid "Reorder"
 msgstr ""
 
-#: wagtail_hooks.py:232
+#: wagtail_hooks.py:319
 msgid "Schedule publication"
 msgstr ""
 
-#: wagtail_hooks.py:233
+#: wagtail_hooks.py:320
 msgid "Unschedule publication"
 msgstr ""
 
-#: wagtail_hooks.py:234
+#: wagtail_hooks.py:321
 msgid "Add view restrictions"
 msgstr ""
 
-#: wagtail_hooks.py:235
+#: wagtail_hooks.py:322
 msgid "Update view restrictions"
 msgstr ""
 
-#: wagtail_hooks.py:236
+#: wagtail_hooks.py:323
 msgid "Remove view restrictions"
 msgstr ""
 
-#: wagtail_hooks.py:243
+#: wagtail_hooks.py:324
+msgid "Add comment"
+msgstr ""
+
+#: wagtail_hooks.py:325
+msgid "Edit comment"
+msgstr ""
+
+#: wagtail_hooks.py:326
+msgid "Delete comment"
+msgstr ""
+
+#: wagtail_hooks.py:327
+msgid "Resolve comment"
+msgstr ""
+
+#: wagtail_hooks.py:328
+msgid "Reply to comment"
+msgstr ""
+
+#: wagtail_hooks.py:329
+msgid "Edit reply to comment"
+msgstr ""
+
+#: wagtail_hooks.py:330
+msgid "Delete reply to comment"
+msgstr ""
+
+#: wagtail_hooks.py:337
 #, python-format
 msgid "'%(workflow)s' started. Next step '%(task)s'"
 msgstr ""
 
-#: wagtail_hooks.py:248
+#: wagtail_hooks.py:342
 msgid "Workflow started"
 msgstr ""
 
-#: wagtail_hooks.py:253
+#: wagtail_hooks.py:347
 #, python-format
 msgid "Approved at '%(task)s'. Next step '%(next_task)s'"
 msgstr ""
 
-#: wagtail_hooks.py:258
+#: wagtail_hooks.py:352
 #, python-format
 msgid "Approved at '%(task)s'. '%(workflow)s' complete"
 msgstr ""
 
-#: wagtail_hooks.py:263
+#: wagtail_hooks.py:357
 msgid "Workflow task approved"
 msgstr ""
 
-#: wagtail_hooks.py:267
+#: wagtail_hooks.py:361
 #, python-format
 msgid "Rejected at '%(task)s'. Changes requested"
 msgstr ""
 
-#: wagtail_hooks.py:271
+#: wagtail_hooks.py:365
 msgid "Workflow task rejected. Workflow complete"
 msgstr ""
 
-#: wagtail_hooks.py:275
+#: wagtail_hooks.py:369
 #, python-format
 msgid "Resubmitted '%(task)s'. Workflow resumed'"
 msgstr ""
 
-#: wagtail_hooks.py:279
+#: wagtail_hooks.py:373
 msgid "Workflow task resubmitted. Workflow resumed"
 msgstr ""
 
-#: wagtail_hooks.py:283
+#: wagtail_hooks.py:377
 #, python-format
 msgid "Cancelled '%(workflow)s' at '%(task)s'"
 msgstr ""
 
-#: wagtail_hooks.py:288
+#: wagtail_hooks.py:382
 msgid "Workflow cancelled"
 msgstr ""
 
-#: wagtail_hooks.py:290
+#: wagtail_hooks.py:387
 msgid "Workflow: start"
 msgstr ""
 
-#: wagtail_hooks.py:291
+#: wagtail_hooks.py:388
 msgid "Workflow: approve task"
 msgstr ""
 
-#: wagtail_hooks.py:292
+#: wagtail_hooks.py:389
 msgid "Workflow: reject task"
 msgstr ""
 
-#: wagtail_hooks.py:293
+#: wagtail_hooks.py:390
 msgid "Workflow: resume task"
 msgstr ""
 
-#: wagtail_hooks.py:294
+#: wagtail_hooks.py:391
 msgid "Workflow: cancel"
 msgstr ""
diff --git a/wagtail/documents/locale/en/LC_MESSAGES/django.po b/wagtail/documents/locale/en/LC_MESSAGES/django.po
index b2d9688d03..e8e054ba7e 100644
--- a/wagtail/documents/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/documents/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/wagtail/embeds/locale/en/LC_MESSAGES/django.po b/wagtail/embeds/locale/en/LC_MESSAGES/django.po
index 347fb23ade..8e0828af13 100644
--- a/wagtail/embeds/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/embeds/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Wagtail embeds"
 msgstr ""
 
-#: blocks.py:70 views/chooser.py:46
+#: blocks.py:72 views/chooser.py:46
 msgid "Cannot find an embed for this URL."
 msgstr ""
 
@@ -33,11 +33,11 @@ msgstr ""
 msgid "Please enter a valid URL"
 msgstr ""
 
-#: models.py:40
+#: models.py:41
 msgid "embed"
 msgstr ""
 
-#: models.py:41
+#: models.py:42
 msgid "embeds"
 msgstr ""
 
diff --git a/wagtail/images/locale/en/LC_MESSAGES/django.po b/wagtail/images/locale/en/LC_MESSAGES/django.po
index c234cc173c..403cbd10e1 100644
--- a/wagtail/images/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/images/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -142,7 +142,7 @@ msgstr ""
 msgid "Add/edit images you own"
 msgstr ""
 
-#: forms.py:141 views/images.py:290
+#: forms.py:141 views/images.py:302
 msgid "Edit"
 msgstr ""
 
@@ -178,7 +178,7 @@ msgstr ""
 msgid "created at"
 msgstr ""
 
-#: models.py:73 models.py:601
+#: models.py:73 models.py:608
 msgid "uploaded by user"
 msgstr ""
 
@@ -491,41 +491,41 @@ msgstr ""
 msgid "Add an image permission"
 msgstr ""
 
-#: views/images.py:47 views/images.py:53
+#: views/images.py:51 views/images.py:57
 msgid "Search images"
 msgstr ""
 
-#: views/images.py:139
+#: views/images.py:151
 msgid "Image '{0}' updated."
 msgstr ""
 
-#: views/images.py:140
+#: views/images.py:152
 msgid "Edit again"
 msgstr ""
 
-#: views/images.py:144
+#: views/images.py:156
 msgid "The image could not be saved due to errors."
 msgstr ""
 
-#: views/images.py:159
+#: views/images.py:171
 msgid ""
 "The source image file could not be found. Please change the source or delete "
 "the image."
 msgstr ""
 
-#: views/images.py:161
+#: views/images.py:173
 msgid "Delete"
 msgstr ""
 
-#: views/images.py:259
+#: views/images.py:271
 msgid "Image '{0}' deleted."
 msgstr ""
 
-#: views/images.py:289
+#: views/images.py:301
 msgid "Image '{0}' added."
 msgstr ""
 
-#: views/images.py:294
+#: views/images.py:306
 msgid "The image could not be created due to errors."
 msgstr ""
 
diff --git a/wagtail/locales/locale/en/LC_MESSAGES/django.po b/wagtail/locales/locale/en/LC_MESSAGES/django.po
index 88ffba212a..7119f17d5a 100644
--- a/wagtail/locales/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/locales/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/wagtail/search/locale/en/LC_MESSAGES/django.po b/wagtail/search/locale/en/LC_MESSAGES/django.po
index 86a872130a..3947da801d 100644
--- a/wagtail/search/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/search/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/wagtail/sites/locale/en/LC_MESSAGES/django.po b/wagtail/sites/locale/en/LC_MESSAGES/django.po
index 4b927783aa..688aee1f68 100644
--- a/wagtail/sites/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/sites/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/wagtail/snippets/locale/en/LC_MESSAGES/django.po b/wagtail/snippets/locale/en/LC_MESSAGES/django.po
index b3f164f285..caa94f40eb 100644
--- a/wagtail/snippets/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/snippets/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: templates/wagtailsnippets/chooser/choose.html:14
+#: templates/wagtailsnippets/chooser/choose.html:18
 msgid "Search"
 msgstr ""
 
@@ -201,40 +201,40 @@ msgstr ""
 msgid "Edit this page"
 msgstr ""
 
-#: views/chooser.py:30 views/chooser.py:42 views/snippets.py:116
-#: views/snippets.py:128
+#: views/chooser.py:49 views/chooser.py:61 views/snippets.py:129
+#: views/snippets.py:141
 #, python-format
 msgid "Search %(snippet_type_name)s"
 msgstr ""
 
-#: views/snippets.py:204
+#: views/snippets.py:217
 #, python-format
 msgid "%(snippet_type)s '%(instance)s' created."
 msgstr ""
 
-#: views/snippets.py:211 views/snippets.py:291 wagtail_hooks.py:50
+#: views/snippets.py:224 views/snippets.py:304 wagtail_hooks.py:50
 msgid "Edit"
 msgstr ""
 
-#: views/snippets.py:227
+#: views/snippets.py:240
 msgid "The snippet could not be created due to errors."
 msgstr ""
 
-#: views/snippets.py:284
+#: views/snippets.py:297
 #, python-format
 msgid "%(snippet_type)s '%(instance)s' updated."
 msgstr ""
 
-#: views/snippets.py:303
+#: views/snippets.py:316
 msgid "The snippet could not be saved due to errors."
 msgstr ""
 
-#: views/snippets.py:360
+#: views/snippets.py:373
 #, python-format
 msgid "%(snippet_type)s '%(instance)s' deleted."
 msgstr ""
 
-#: views/snippets.py:369
+#: views/snippets.py:382
 #, python-format
 msgid "%(count)d %(snippet_type)s deleted."
 msgid_plural "%(count)d %(snippet_type)s deleted."
diff --git a/wagtail/users/locale/en/LC_MESSAGES/django.po b/wagtail/users/locale/en/LC_MESSAGES/django.po
index e17cc9569f..af56a34692 100644
--- a/wagtail/users/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/users/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-20 20:19+0100\n"
+"POT-Creation-Date: 2021-07-13 13:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,78 +21,66 @@ msgstr ""
 msgid "Wagtail users"
 msgstr ""
 
-#: forms.py:52
+#: forms.py:42
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 
-#: forms.py:56
+#: forms.py:46
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 
-#: forms.py:79
+#: forms.py:69
 msgid "A user with that username already exists."
 msgstr ""
 
-#: forms.py:80
+#: forms.py:70
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: forms.py:83 forms.py:443
+#: forms.py:73
 msgid "Email"
 msgstr ""
 
-#: forms.py:84 forms.py:441
+#: forms.py:74
 msgid "First Name"
 msgstr ""
 
-#: forms.py:85 forms.py:442
+#: forms.py:75
 msgid "Last Name"
 msgstr ""
 
-#: forms.py:88
+#: forms.py:78
 msgid "Password"
 msgstr ""
 
-#: forms.py:90
+#: forms.py:80
 msgid "Leave blank if not changing."
 msgstr ""
 
-#: forms.py:92
+#: forms.py:82
 msgid "Password confirmation"
 msgstr ""
 
-#: forms.py:94
+#: forms.py:84
 msgid "Enter the same password as above, for verification."
 msgstr ""
 
-#: forms.py:97 forms.py:225
+#: forms.py:87 forms.py:215
 msgid "Administrator"
 msgstr ""
 
-#: forms.py:98 forms.py:227
+#: forms.py:88 forms.py:217
 msgid "Administrators have full access to manage any object or setting."
 msgstr ""
 
-#: forms.py:221
+#: forms.py:211
 msgid "A group with that name already exists."
 msgstr ""
 
-#: forms.py:325
+#: forms.py:315
 msgid "You cannot have multiple permission records for the same page."
 msgstr ""
 
-#: forms.py:427
-msgid "Preferred language"
-msgstr ""
-
-#: forms.py:432
-msgid "Current time zone"
-msgstr ""
-
-#: forms.py:459
-msgid "Upload a profile picture"
-msgstr ""
-
 #: models.py:25
 msgid "submitted notifications"
 msgstr ""
@@ -157,7 +145,7 @@ msgstr ""
 
 #: templates/wagtailusers/groups/confirm_delete.html:3
 #: templates/wagtailusers/groups/confirm_delete.html:6
-#: templates/wagtailusers/groups/edit.html:40 views/groups.py:110
+#: templates/wagtailusers/groups/edit.html:43 views/groups.py:110
 #: views/groups.py:147
 msgid "Delete group"
 msgstr ""
@@ -194,7 +182,7 @@ msgstr ""
 
 #: templates/wagtailusers/groups/create.html:4
 #: templates/wagtailusers/groups/create.html:15
-#: templates/wagtailusers/groups/create.html:32 views/groups.py:71
+#: templates/wagtailusers/groups/create.html:35 views/groups.py:71
 msgid "Add group"
 msgstr ""
 
@@ -209,7 +197,7 @@ msgstr ""
 msgid "View users in this group"
 msgstr ""
 
-#: templates/wagtailusers/groups/edit.html:37
+#: templates/wagtailusers/groups/edit.html:40
 #: templates/wagtailusers/users/edit.html:41
 #: templates/wagtailusers/users/edit.html:56
 msgid "Save"
@@ -241,7 +229,7 @@ msgstr ""
 
 #: templates/wagtailusers/groups/includes/formatted_permissions.html:16
 #: templates/wagtailusers/groups/includes/page_permissions_form.html:13
-#: wagtail_hooks.py:108
+#: wagtail_hooks.py:125
 msgid "Delete"
 msgstr ""
 
@@ -311,8 +299,8 @@ msgid "Roles"
 msgstr ""
 
 #: templates/wagtailusers/users/index.html:3
-#: templates/wagtailusers/users/index.html:20 wagtail_hooks.py:48
-#: wagtail_hooks.py:98
+#: templates/wagtailusers/users/index.html:20 wagtail_hooks.py:65
+#: wagtail_hooks.py:115
 msgid "Users"
 msgstr ""
 
@@ -386,7 +374,7 @@ msgid ""
 "\">add some</a>?"
 msgstr ""
 
-#: views/groups.py:54 wagtail_hooks.py:67
+#: views/groups.py:54 wagtail_hooks.py:84
 msgid "Groups"
 msgstr ""
 
@@ -418,7 +406,7 @@ msgstr ""
 msgid "User '{0}' created."
 msgstr ""
 
-#: views/users.py:133 views/users.py:170 wagtail_hooks.py:106
+#: views/users.py:133 views/users.py:170 wagtail_hooks.py:123
 msgid "Edit"
 msgstr ""
 
@@ -438,10 +426,10 @@ msgstr ""
 msgid "User '{0}' deleted."
 msgstr ""
 
-#: wagtail_hooks.py:106
+#: wagtail_hooks.py:123
 msgid "Edit this user"
 msgstr ""
 
-#: wagtail_hooks.py:108
+#: wagtail_hooks.py:125
 msgid "Delete this user"
 msgstr ""