diff --git a/wagtail/admin/locale/en/LC_MESSAGES/django.po b/wagtail/admin/locale/en/LC_MESSAGES/django.po
index f691749980..fcdc5f8eb8 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: 2018-05-04 20:22+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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"
@@ -29,23 +29,23 @@ msgstr ""
 msgid "You do not have permission to access the admin"
 msgstr ""
 
-#: edit_handlers.py:765
+#: edit_handlers.py:756
 msgid "Scheduled publishing"
 msgstr ""
 
-#: edit_handlers.py:783
+#: edit_handlers.py:774
 msgid "Common page configuration"
 msgstr ""
 
-#: edit_handlers.py:806
+#: edit_handlers.py:797
 msgid "Content"
 msgstr ""
 
-#: edit_handlers.py:808
+#: edit_handlers.py:799
 msgid "Promote"
 msgstr ""
 
-#: edit_handlers.py:810 wagtail_hooks.py:63
+#: edit_handlers.py:801 wagtail_hooks.py:63
 msgid "Settings"
 msgstr ""
 
@@ -307,11 +307,11 @@ msgstr ""
 #: templates/wagtailadmin/admin_base.html:31
 #: templates/wagtailadmin/home/pages_for_moderation.html:42
 #: templates/wagtailadmin/home/recent_edits.html:28
-#: templates/wagtailadmin/pages/revisions/list.html:30 views/generic.py:107
-#: views/generic.py:174 views/pages.py:236 views/pages.py:242
-#: views/pages.py:256 views/pages.py:394 views/pages.py:418 views/pages.py:437
-#: views/pages.py:696 views/pages.py:758 views/pages.py:931 views/pages.py:952
-#: views/pages.py:1169 wagtail_hooks.py:104
+#: templates/wagtailadmin/pages/revisions/list.html:31 views/generic.py:107
+#: views/generic.py:174 views/pages.py:237 views/pages.py:243
+#: views/pages.py:257 views/pages.py:396 views/pages.py:420 views/pages.py:439
+#: views/pages.py:698 views/pages.py:760 views/pages.py:987
+#: views/pages.py:1008 views/pages.py:1225 wagtail_hooks.py:104
 msgid "Edit"
 msgstr ""
 
@@ -627,7 +627,7 @@ msgstr ""
 #: templates/wagtailadmin/home/pages_for_moderation.html:43
 #: templates/wagtailadmin/pages/create.html:45
 #: templates/wagtailadmin/pages/edit.html:67
-#: templates/wagtailadmin/pages/revisions/list.html:28
+#: templates/wagtailadmin/pages/revisions/list.html:29
 msgid "Preview"
 msgstr ""
 
@@ -660,8 +660,8 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#: templates/wagtailadmin/home/recent_edits.html:33 views/pages.py:1107
-#: views/pages.py:1125
+#: templates/wagtailadmin/home/recent_edits.html:33 views/pages.py:1163
+#: views/pages.py:1181
 msgid "Live"
 msgstr ""
 
@@ -963,8 +963,8 @@ msgstr ""
 msgid "Submit for moderation"
 msgstr ""
 
-#: templates/wagtailadmin/pages/create.html:83
-#: templates/wagtailadmin/pages/edit.html:116
+#: templates/wagtailadmin/pages/create.html:97
+#: templates/wagtailadmin/pages/edit.html:130
 msgid "This page has unsaved changes."
 msgstr ""
 
@@ -1270,36 +1270,36 @@ msgstr ""
 msgid "Revision date"
 msgstr ""
 
-#: templates/wagtailadmin/pages/revisions/list.html:20
+#: templates/wagtailadmin/pages/revisions/list.html:21
 msgctxt "points to a user who created a revision"
 msgid "by"
 msgstr ""
 
-#: templates/wagtailadmin/pages/revisions/list.html:22
+#: templates/wagtailadmin/pages/revisions/list.html:23
 msgid "Current draft"
 msgstr ""
 
-#: templates/wagtailadmin/pages/revisions/list.html:23
+#: templates/wagtailadmin/pages/revisions/list.html:24
 msgid "Live version"
 msgstr ""
 
-#: templates/wagtailadmin/pages/revisions/list.html:24
+#: templates/wagtailadmin/pages/revisions/list.html:25
 msgid "Scheduled for"
 msgstr ""
 
-#: templates/wagtailadmin/pages/revisions/list.html:32
+#: templates/wagtailadmin/pages/revisions/list.html:33
 msgid "Review this revision"
 msgstr ""
 
-#: templates/wagtailadmin/pages/revisions/list.html:36
+#: templates/wagtailadmin/pages/revisions/list.html:37
 msgid "Compare with previous revision"
 msgstr ""
 
-#: templates/wagtailadmin/pages/revisions/list.html:40
+#: templates/wagtailadmin/pages/revisions/list.html:41
 msgid "Cancel scheduled publish"
 msgstr ""
 
-#: templates/wagtailadmin/pages/revisions/list.html:47
+#: templates/wagtailadmin/pages/revisions/list.html:48
 msgid "No revisions of this page exist"
 msgstr ""
 
@@ -1320,12 +1320,16 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/wagtailadmin/pages/search_results.html:20
+#: templates/wagtailadmin/pages/search_results.html:16
+msgid "Page types"
+msgstr ""
+
+#: templates/wagtailadmin/pages/search_results.html:41
 #, python-format
 msgid "Sorry, no pages match <em>\"%(query_string)s\"</em>"
 msgstr ""
 
-#: templates/wagtailadmin/pages/search_results.html:24
+#: templates/wagtailadmin/pages/search_results.html:45
 msgid "Enter a search term above"
 msgstr ""
 
@@ -1615,12 +1619,10 @@ msgid "Add collection"
 msgstr ""
 
 #: views/collections.py:32
-#, python-brace-format
 msgid "Collection '{0}' created."
 msgstr ""
 
 #: views/collections.py:51
-#, python-brace-format
 msgid "Collection '{0}' updated."
 msgstr ""
 
@@ -1633,7 +1635,6 @@ msgid "Delete collection"
 msgstr ""
 
 #: views/collections.py:68
-#, python-brace-format
 msgid "Collection '{0}' deleted."
 msgstr ""
 
@@ -1645,199 +1646,171 @@ msgstr ""
 msgid "Editing"
 msgstr ""
 
-#: views/pages.py:235
-#, python-brace-format
+#: views/pages.py:236
 msgid "Page '{0}' created and scheduled for publishing."
 msgstr ""
 
-#: views/pages.py:241 views/pages.py:417 views/pages.py:930
+#: views/pages.py:242 views/pages.py:419 views/pages.py:986
 #: wagtail_hooks.py:118
 msgid "View live"
 msgstr ""
 
-#: views/pages.py:243
-#, python-brace-format
+#: views/pages.py:244
 msgid "Page '{0}' created and published."
 msgstr ""
 
-#: views/pages.py:247
-#, python-brace-format
+#: views/pages.py:248
 msgid "Page '{0}' created and submitted for moderation."
 msgstr ""
 
-#: views/pages.py:251 views/pages.py:432 wagtail_hooks.py:111
+#: views/pages.py:252 views/pages.py:434 wagtail_hooks.py:111
 msgid "View draft"
 msgstr ""
 
-#: views/pages.py:261 views/pages.py:442
+#: views/pages.py:262 views/pages.py:444
 msgid "Failed to send notifications to moderators"
 msgstr ""
 
-#: views/pages.py:263
-#, python-brace-format
+#: views/pages.py:264
 msgid "Page '{0}' created."
 msgstr ""
 
-#: views/pages.py:286
+#: views/pages.py:287
 msgid "The page could not be created due to validation errors"
 msgstr ""
 
-#: views/pages.py:372
-#, python-brace-format
+#: views/pages.py:374
 msgid "Revision from {0} of page '{1}' has been scheduled for publishing."
 msgstr ""
 
-#: views/pages.py:380
-#, python-brace-format
+#: views/pages.py:382
 msgid "Page '{0}' is live and this revision has been scheduled for publishing."
 msgstr ""
 
-#: views/pages.py:386
-#, python-brace-format
+#: views/pages.py:388
 msgid "Page '{0}' has been scheduled for publishing."
 msgstr ""
 
-#: views/pages.py:403
-#, python-brace-format
+#: views/pages.py:405
 msgid "Revision from {0} of page '{1}' has been published."
 msgstr ""
 
-#: views/pages.py:410
-#, python-brace-format
+#: views/pages.py:412
 msgid "Page '{0}' has been published."
 msgstr ""
 
-#: views/pages.py:424
-#, python-brace-format
+#: views/pages.py:426
 msgid "Page '{0}' has been submitted for moderation."
 msgstr ""
 
-#: views/pages.py:448
-#, python-brace-format
+#: views/pages.py:450
 msgid "Page '{0}' has been replaced with revision from {1}."
 msgstr ""
 
-#: views/pages.py:455
-#, python-brace-format
+#: views/pages.py:457
 msgid "Page '{0}' has been updated."
 msgstr ""
 
-#: views/pages.py:483
+#: views/pages.py:485
 msgid "The page could not be saved as it is locked"
 msgstr ""
 
-#: views/pages.py:486
+#: views/pages.py:488
 msgid "The page could not be saved due to validation errors"
 msgstr ""
 
-#: views/pages.py:513
+#: views/pages.py:515
 msgid "Compare with live version"
 msgstr ""
 
-#: views/pages.py:516
+#: views/pages.py:518
 msgid "This page is currently awaiting moderation"
 msgstr ""
 
-#: views/pages.py:553
-#, python-brace-format
+#: views/pages.py:555
 msgid "Page '{0}' deleted."
 msgstr ""
 
-#: views/pages.py:695
-#, python-brace-format
+#: views/pages.py:697
 msgid "Page '{0}' unpublished."
 msgstr ""
 
-#: views/pages.py:757
-#, python-brace-format
+#: views/pages.py:759
 msgid "Page '{0}' moved."
 msgstr ""
 
-#: views/pages.py:862
-#, python-brace-format
+#: views/pages.py:864
 msgid "Page '{0}' and {1} subpages copied."
 msgstr ""
 
-#: views/pages.py:865
-#, python-brace-format
+#: views/pages.py:867
 msgid "Page '{0}' copied."
 msgstr ""
 
-#: views/pages.py:921 views/pages.py:946 views/pages.py:967
-#, python-brace-format
+#: views/pages.py:977 views/pages.py:1002 views/pages.py:1023
 msgid "The page '{0}' is not currently awaiting moderation."
 msgstr ""
 
-#: views/pages.py:927
-#, python-brace-format
+#: views/pages.py:983
 msgid "Page '{0}' published."
 msgstr ""
 
-#: views/pages.py:935
+#: views/pages.py:991
 msgid "Failed to send approval notifications"
 msgstr ""
 
-#: views/pages.py:951
-#, python-brace-format
+#: views/pages.py:1007
 msgid "Page '{0}' rejected for publication."
 msgstr ""
 
-#: views/pages.py:955
+#: views/pages.py:1011
 msgid "Failed to send rejection notifications"
 msgstr ""
 
-#: views/pages.py:993
-#, python-brace-format
+#: views/pages.py:1049
 msgid "Page '{0}' is now locked."
 msgstr ""
 
-#: views/pages.py:1017
-#, python-brace-format
+#: views/pages.py:1073
 msgid "Page '{0}' is now unlocked."
 msgstr ""
 
-#: views/pages.py:1071
+#: views/pages.py:1127
 #, python-format
 msgid ""
 "You are viewing a previous revision of this page from <b>%(created_at)s</b> "
 "by %(user)s"
 msgstr ""
 
-#: views/pages.py:1112
+#: views/pages.py:1168
 msgid "Earliest"
 msgstr ""
 
-#: views/pages.py:1130
+#: views/pages.py:1186
 msgid "Latest"
 msgstr ""
 
-#: views/pages.py:1162
-#, python-brace-format
+#: views/pages.py:1218
 msgid "revision {0} of \"{1}\""
 msgstr ""
 
-#: views/pages.py:1168
-#, python-brace-format
+#: views/pages.py:1224
 msgid "Revision {0} of \"{1}\" unscheduled."
 msgstr ""
 
 #: wagtail_hooks.py:106
-#, python-brace-format
 msgid "Edit '{title}'"
 msgstr ""
 
 #: wagtail_hooks.py:113
-#, python-brace-format
 msgid "Preview draft version of '{title}'"
 msgstr ""
 
 #: wagtail_hooks.py:120
-#, python-brace-format
 msgid "View live version of '{title}'"
 msgstr ""
 
 #: wagtail_hooks.py:128 wagtail_hooks.py:136
-#, python-brace-format
 msgid "Add a child page to '{title}' "
 msgstr ""
 
@@ -1846,32 +1819,26 @@ msgid "More"
 msgstr ""
 
 #: wagtail_hooks.py:146
-#, python-brace-format
 msgid "View more options for '{title}'"
 msgstr ""
 
 #: wagtail_hooks.py:157
-#, python-brace-format
 msgid "Move page '{title}'"
 msgstr ""
 
 #: wagtail_hooks.py:164
-#, python-brace-format
 msgid "Copy page '{title}'"
 msgstr ""
 
 #: wagtail_hooks.py:171
-#, python-brace-format
 msgid "Delete page '{title}'"
 msgstr ""
 
 #: wagtail_hooks.py:178
-#, python-brace-format
 msgid "Unpublish page '{title}'"
 msgstr ""
 
 #: wagtail_hooks.py:185
-#, python-brace-format
 msgid "View revision history for '{title}'"
 msgstr ""
 
@@ -1911,29 +1878,28 @@ msgstr ""
 msgid "Choose your current time zone."
 msgstr ""
 
-#: wagtail_hooks.py:341 wagtail_hooks.py:356 wagtail_hooks.py:371
-#: wagtail_hooks.py:386 wagtail_hooks.py:401 wagtail_hooks.py:416
-#, python-brace-format
+#: wagtail_hooks.py:344 wagtail_hooks.py:359 wagtail_hooks.py:374
+#: wagtail_hooks.py:389 wagtail_hooks.py:404 wagtail_hooks.py:419
 msgid "Heading {level}"
 msgstr ""
 
-#: wagtail_hooks.py:431
+#: wagtail_hooks.py:434
 msgid "Bulleted list"
 msgstr ""
 
-#: wagtail_hooks.py:447
+#: wagtail_hooks.py:450
 msgid "Numbered list"
 msgstr ""
 
-#: wagtail_hooks.py:464
+#: wagtail_hooks.py:467
 msgid "Bold"
 msgstr ""
 
-#: wagtail_hooks.py:480
+#: wagtail_hooks.py:483
 msgid "Italic"
 msgstr ""
 
-#: wagtail_hooks.py:497
+#: wagtail_hooks.py:500
 msgid "Link"
 msgstr ""
 
diff --git a/wagtail/contrib/forms/locale/en/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/en/LC_MESSAGES/django.po
index 624fd806b5..d80718bf75 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: 2018-05-04 20:23+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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 947a306f73..896a50c101 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: 2018-05-04 20:23+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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"
@@ -84,26 +84,26 @@ msgstr ""
 msgid "image"
 msgstr ""
 
-#: templates/modeladmin/choose_parent.html:25
+#: templates/modeladmin/choose_parent.html:28
 msgid "Choose a parent page"
 msgstr ""
 
-#: templates/modeladmin/choose_parent.html:26
+#: templates/modeladmin/choose_parent.html:29
 #, python-format
 msgid ""
 "%(plural)s can be added to more than one place within your site. Which of "
 "the following would you like to be the parent of your new page?"
 msgstr ""
 
-#: templates/modeladmin/choose_parent.html:34
+#: templates/modeladmin/choose_parent.html:37
 msgid "Continue"
 msgstr ""
 
-#: templates/modeladmin/create.html:33 templates/modeladmin/edit.html:8
+#: templates/modeladmin/create.html:38 templates/modeladmin/edit.html:8
 msgid "Saving…"
 msgstr ""
 
-#: templates/modeladmin/create.html:34 templates/modeladmin/edit.html:9
+#: templates/modeladmin/create.html:39 templates/modeladmin/edit.html:9
 msgid "Save"
 msgstr ""
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Page %(current_page)s of %(num_pages)s."
 msgstr ""
 
-#: templates/modeladmin/inspect.html:25
+#: templates/modeladmin/inspect.html:26
 #, python-format
 msgid "Back to %(model_name)s list"
 msgstr ""
@@ -195,7 +195,6 @@ msgid "Next"
 msgstr ""
 
 #: views.py:151
-#, python-brace-format
 msgid "{model_name} '{instance}' created."
 msgstr ""
 
@@ -223,7 +222,6 @@ msgid "Editing %s"
 msgstr ""
 
 #: views.py:706
-#, python-brace-format
 msgid "{model_name} '{instance}' updated."
 msgstr ""
 
@@ -245,7 +243,6 @@ msgid ""
 msgstr ""
 
 #: views.py:792
-#, python-brace-format
 msgid "{model} '{instance}' deleted."
 msgstr ""
 
diff --git a/wagtail/contrib/redirects/locale/en/LC_MESSAGES/django.po b/wagtail/contrib/redirects/locale/en/LC_MESSAGES/django.po
index f6e21fc8da..e6f88f77bf 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: 2018-05-04 20:23+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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"
@@ -163,7 +163,6 @@ msgid "Search redirects"
 msgstr ""
 
 #: views.py:73
-#, python-brace-format
 msgid "Redirect '{0}' updated."
 msgstr ""
 
@@ -176,12 +175,10 @@ msgid "The redirect could not be saved due to errors."
 msgstr ""
 
 #: views.py:100
-#, python-brace-format
 msgid "Redirect '{0}' deleted."
 msgstr ""
 
 #: views.py:115
-#, python-brace-format
 msgid "Redirect '{0}' added."
 msgstr ""
 
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 5451f271a5..fe1cd27b11 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: 2018-05-04 20:23+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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"
@@ -177,11 +177,10 @@ msgid "Search promoted results"
 msgstr ""
 
 #: views.py:83
-#, python-brace-format
 msgid "Editor's picks for '{0}' created."
 msgstr ""
 
-#: views.py:84 views.py:122
+#: views.py:84 views.py:123
 msgid "Edit"
 msgstr ""
 
@@ -189,15 +188,14 @@ msgstr ""
 msgid "Recommendations have not been created due to errors"
 msgstr ""
 
-#: views.py:121
-#, python-brace-format
+#: views.py:122
 msgid "Editor's picks for '{0}' updated."
 msgstr ""
 
-#: views.py:130
+#: views.py:131
 msgid "Recommendations have not been saved due to errors"
 msgstr ""
 
-#: views.py:150
+#: views.py:152
 msgid "Editor's picks deleted."
 msgstr ""
diff --git a/wagtail/contrib/settings/locale/en/LC_MESSAGES/django.po b/wagtail/contrib/settings/locale/en/LC_MESSAGES/django.po
index f714c469b1..3a4f188454 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: 2018-05-04 20:23+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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,6 @@ msgid "This setting could not be opened because there is no site defined."
 msgstr ""
 
 #: views.py:68
-#, python-brace-format
 msgid "{setting_type} updated."
 msgstr ""
 
diff --git a/wagtail/contrib/styleguide/locale/en/LC_MESSAGES/django.po b/wagtail/contrib/styleguide/locale/en/LC_MESSAGES/django.po
index f7e0c44a8a..eae410648f 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: 2018-05-04 20:23+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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"
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Styleguide"
 msgstr ""
 
-#: templates/wagtailstyleguide/base.html:521
+#: templates/wagtailstyleguide/base.html:733
 msgid "Save"
 msgstr ""
 
-#: templates/wagtailstyleguide/base.html:521
+#: templates/wagtailstyleguide/base.html:733
 msgid "Delete image"
 msgstr ""
 
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 9016ea1302..13476fd5ce 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: 2018-05-04 20:23+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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 a734b508fb..cefd75b99a 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: 2018-05-04 20:22+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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,7 +22,6 @@ msgid "Wagtail core"
 msgstr ""
 
 #: blocks/static_block.py:15
-#, python-brace-format
 msgid "{label}: this block has no options."
 msgstr ""
 
@@ -126,7 +125,7 @@ msgstr ""
 msgid "content type"
 msgstr ""
 
-#: models.py:258 models.py:1014
+#: models.py:258 models.py:1015
 msgid "live"
 msgstr ""
 
@@ -173,7 +172,7 @@ msgstr ""
 msgid "expiry date/time"
 msgstr ""
 
-#: models.py:300 models.py:1003
+#: models.py:300 models.py:1004
 msgid "expired"
 msgstr ""
 
@@ -193,187 +192,187 @@ msgstr ""
 msgid "latest revision created at"
 msgstr ""
 
-#: models.py:437
+#: models.py:438
 msgid "This slug is already in use"
 msgstr ""
 
-#: models.py:1005
+#: models.py:1006
 msgid "scheduled"
 msgstr ""
 
-#: models.py:1007
+#: models.py:1008
 msgid "draft"
 msgstr ""
 
-#: models.py:1010
+#: models.py:1011
 msgid "live + scheduled"
 msgstr ""
 
-#: models.py:1012
+#: models.py:1013
 msgid "live + draft"
 msgstr ""
 
-#: models.py:1279
+#: models.py:1280
 msgid "Default"
 msgstr ""
 
-#: models.py:1389 models.py:1408 models.py:1564 models.py:1920
+#: models.py:1390 models.py:1409 models.py:1565 models.py:1924
 msgid "page"
 msgstr ""
 
-#: models.py:1390
+#: models.py:1391
 msgid "pages"
 msgstr ""
 
-#: models.py:1410
+#: models.py:1411
 msgid "submitted for moderation"
 msgstr ""
 
-#: models.py:1414
+#: models.py:1415
 msgid "created at"
 msgstr ""
 
-#: models.py:1416
+#: models.py:1417
 msgid "user"
 msgstr ""
 
-#: models.py:1419
+#: models.py:1420
 msgid "content JSON"
 msgstr ""
 
-#: models.py:1420
+#: models.py:1421
 msgid "approved go live at"
 msgstr ""
 
-#: models.py:1544
+#: models.py:1545
 msgid "page revision"
 msgstr ""
 
-#: models.py:1545
+#: models.py:1546
 msgid "page revisions"
 msgstr ""
 
-#: models.py:1549
+#: models.py:1550
 msgid "Add"
 msgstr ""
 
-#: models.py:1549
+#: models.py:1550
 msgid "Add/edit pages you own"
 msgstr ""
 
-#: models.py:1550
+#: models.py:1551
 msgid "Edit"
 msgstr ""
 
-#: models.py:1550
+#: models.py:1551
 msgid "Edit any page"
 msgstr ""
 
-#: models.py:1551
+#: models.py:1552
 msgid "Publish"
 msgstr ""
 
-#: models.py:1551
+#: models.py:1552
 msgid "Publish any page"
 msgstr ""
 
-#: models.py:1552
+#: models.py:1553
 msgid "Bulk delete"
 msgstr ""
 
-#: models.py:1552
+#: models.py:1553
 msgid "Delete pages with children"
 msgstr ""
 
-#: models.py:1553
+#: models.py:1554
 msgid "Lock"
 msgstr ""
 
-#: models.py:1553
+#: models.py:1554
 msgid "Lock/unlock any page"
 msgstr ""
 
-#: models.py:1563 models.py:2019
+#: models.py:1564 models.py:2023
 msgid "group"
 msgstr ""
 
-#: models.py:1566
+#: models.py:1567
 msgid "permission type"
 msgstr ""
 
-#: models.py:1573
+#: models.py:1574
 msgid "group page permission"
 msgstr ""
 
-#: models.py:1574
+#: models.py:1575
 msgid "group page permissions"
 msgstr ""
 
-#: models.py:1867
+#: models.py:1871
 msgid "Public"
 msgstr ""
 
-#: models.py:1868
+#: models.py:1872
 msgid "Private, accessible to logged-in users"
 msgstr ""
 
-#: models.py:1869
+#: models.py:1873
 msgid "Private, accessible with the following password"
 msgstr ""
 
-#: models.py:1870
+#: models.py:1874
 msgid "Private, accessible to users in specific groups"
 msgstr ""
 
-#: models.py:1875
+#: models.py:1879
 msgid "password"
 msgstr ""
 
-#: models.py:1876
+#: models.py:1880
 msgid "groups"
 msgstr ""
 
-#: models.py:1914
+#: models.py:1918
 msgid "view restriction"
 msgstr ""
 
-#: models.py:1915
+#: models.py:1919
 msgid "view restrictions"
 msgstr ""
 
-#: models.py:1926
+#: models.py:1930
 msgid "page view restriction"
 msgstr ""
 
-#: models.py:1927
+#: models.py:1931
 msgid "page view restrictions"
 msgstr ""
 
-#: models.py:1941 models.py:1984 models.py:1999 models.py:2025
+#: models.py:1945 models.py:1988 models.py:2003 models.py:2029
 msgid "collection"
 msgstr ""
 
-#: models.py:1949
+#: models.py:1953
 msgid "collection view restriction"
 msgstr ""
 
-#: models.py:1950
+#: models.py:1954
 msgid "collection view restrictions"
 msgstr ""
 
-#: models.py:1957
+#: models.py:1961
 msgid "name"
 msgstr ""
 
-#: models.py:1985
+#: models.py:1989
 msgid "collections"
 msgstr ""
 
-#: models.py:2031
+#: models.py:2035
 msgid "permission"
 msgstr ""
 
-#: models.py:2044
+#: models.py:2048
 msgid "group collection permission"
 msgstr ""
 
diff --git a/wagtail/documents/locale/en/LC_MESSAGES/django.po b/wagtail/documents/locale/en/LC_MESSAGES/django.po
index 1bedf3695d..b1d0437442 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: 2018-05-04 20:22+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "Add/edit documents you own"
 msgstr ""
 
-#: forms.py:50 views/documents.py:103 views/documents.py:141
+#: forms.py:50 views/documents.py:107 views/documents.py:147
 msgid "Edit"
 msgstr ""
 
@@ -57,7 +57,7 @@ msgstr ""
 msgid "tags"
 msgstr ""
 
-#: models.py:76
+#: models.py:94
 msgid "document"
 msgstr ""
 
@@ -80,14 +80,6 @@ msgstr ""
 msgid "Uploading…"
 msgstr ""
 
-#: templates/wagtaildocs/chooser/chooser.js:66
-msgid "Server Error"
-msgstr ""
-
-#: templates/wagtaildocs/chooser/chooser.js:67
-msgid "Report this error to your webmaster with the following information:"
-msgstr ""
-
 #: templates/wagtaildocs/chooser/results.html:5
 #: templates/wagtaildocs/documents/results.html:5
 #, python-format
@@ -176,8 +168,8 @@ msgstr ""
 msgid "Usage"
 msgstr ""
 
-#: templates/wagtaildocs/documents/index.html:22 wagtail_hooks.py:50
-#: wagtail_hooks.py:136
+#: templates/wagtaildocs/documents/index.html:22 wagtail_hooks.py:49
+#: wagtail_hooks.py:131
 msgid "Documents"
 msgstr ""
 
@@ -288,7 +280,7 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-#: templates/wagtaildocs/multiple/edit_form.html:15 views/documents.py:163
+#: templates/wagtaildocs/multiple/edit_form.html:15 views/documents.py:167
 msgid "Delete"
 msgstr ""
 
@@ -304,39 +296,44 @@ msgstr ""
 msgid "Add a document permission"
 msgstr ""
 
-#: views/documents.py:49 views/documents.py:54
+#: views/chooser.py:23
+msgid "Server Error"
+msgstr ""
+
+#: views/chooser.py:24
+msgid "Report this error to your webmaster with the following information:"
+msgstr ""
+
+#: views/documents.py:51 views/documents.py:56
 msgid "Search documents"
 msgstr ""
 
-#: views/documents.py:102
-#, python-brace-format
+#: views/documents.py:106
 msgid "Document '{0}' added."
 msgstr ""
 
-#: views/documents.py:107 views/documents.py:145
+#: views/documents.py:111 views/documents.py:151
 msgid "The document could not be saved due to errors."
 msgstr ""
 
-#: views/documents.py:140
-#, python-brace-format
+#: views/documents.py:146
 msgid "Document '{0}' updated"
 msgstr ""
 
-#: views/documents.py:162
+#: views/documents.py:166
 msgid ""
 "The file could not be found. Please change the source or delete the document"
 msgstr ""
 
-#: views/documents.py:186
-#, python-brace-format
+#: views/documents.py:190
 msgid "Document '{0}' deleted."
 msgstr ""
 
-#: wagtail_hooks.py:92
+#: wagtail_hooks.py:87
 msgid "Document"
 msgstr ""
 
-#: wagtail_hooks.py:155
+#: wagtail_hooks.py:150
 #, python-format
 msgid "%(count)s document"
 msgid_plural "%(count)s documents"
diff --git a/wagtail/embeds/locale/en/LC_MESSAGES/django.po b/wagtail/embeds/locale/en/LC_MESSAGES/django.po
index 9be91ae00a..351357efd8 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: 2018-05-04 20:22+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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"
@@ -57,6 +57,6 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: wagtail_hooks.py:56
+#: wagtail_hooks.py:59
 msgid "Embed"
 msgstr ""
diff --git a/wagtail/images/locale/en/LC_MESSAGES/django.po b/wagtail/images/locale/en/LC_MESSAGES/django.po
index 3bfa091014..4bc7188ab3 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: 2018-05-04 20:22+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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"
@@ -117,7 +117,7 @@ msgstr ""
 msgid "Add/edit images you own"
 msgstr ""
 
-#: forms.py:89 views/images.py:257
+#: forms.py:89 views/images.py:270
 msgid "Edit"
 msgstr ""
 
@@ -153,11 +153,11 @@ msgstr ""
 msgid "tags"
 msgstr ""
 
-#: models.py:331
+#: models.py:356
 msgid "image"
 msgstr ""
 
-#: models.py:332
+#: models.py:357
 msgid "images"
 msgstr ""
 
@@ -182,16 +182,6 @@ msgstr ""
 msgid "Uploading…"
 msgstr ""
 
-#: templates/wagtailimages/chooser/chooser.js:81
-#: templates/wagtailimages/multiple/add.html:64
-msgid "Server Error"
-msgstr ""
-
-#: templates/wagtailimages/chooser/chooser.js:82
-#: templates/wagtailimages/multiple/add.html:65
-msgid "Report this error to your webmaster with the following information:"
-msgstr ""
-
 #: templates/wagtailimages/chooser/results.html:6
 #: templates/wagtailimages/images/results.html:6
 #, python-format
@@ -321,8 +311,8 @@ msgid "Usage"
 msgstr ""
 
 #: templates/wagtailimages/images/index.html:5
-#: templates/wagtailimages/images/index.html:24 wagtail_hooks.py:44
-#: wagtail_hooks.py:155
+#: templates/wagtailimages/images/index.html:24 wagtail_hooks.py:43
+#: wagtail_hooks.py:152
 msgid "Images"
 msgstr ""
 
@@ -423,6 +413,14 @@ msgstr ""
 msgid "Sorry, upload failed."
 msgstr ""
 
+#: templates/wagtailimages/multiple/add.html:64 views/chooser.py:24
+msgid "Server Error"
+msgstr ""
+
+#: templates/wagtailimages/multiple/add.html:65 views/chooser.py:25
+msgid "Report this error to your webmaster with the following information:"
+msgstr ""
+
 #: templates/wagtailimages/multiple/add.html:68
 msgid "Image updated."
 msgstr ""
@@ -431,7 +429,7 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-#: templates/wagtailimages/multiple/edit_form.html:15 views/images.py:138
+#: templates/wagtailimages/multiple/edit_form.html:15 views/images.py:142
 msgid "Delete"
 msgstr ""
 
@@ -447,44 +445,41 @@ msgstr ""
 msgid "Search images"
 msgstr ""
 
-#: views/images.py:116
-#, python-brace-format
+#: views/images.py:120
 msgid "Image '{0}' updated."
 msgstr ""
 
-#: views/images.py:117
+#: views/images.py:121
 msgid "Edit again"
 msgstr ""
 
-#: views/images.py:121
+#: views/images.py:125
 msgid "The image could not be saved due to errors."
 msgstr ""
 
-#: views/images.py:136
+#: views/images.py:140
 msgid ""
 "The source image file could not be found. Please change the source or delete "
 "the image."
 msgstr ""
 
-#: views/images.py:231
-#, python-brace-format
+#: views/images.py:240
 msgid "Image '{0}' deleted."
 msgstr ""
 
-#: views/images.py:256
-#, python-brace-format
+#: views/images.py:269
 msgid "Image '{0}' added."
 msgstr ""
 
-#: views/images.py:261
+#: views/images.py:274
 msgid "The image could not be created due to errors."
 msgstr ""
 
-#: wagtail_hooks.py:91
+#: wagtail_hooks.py:86
 msgid "Image"
 msgstr ""
 
-#: wagtail_hooks.py:174
+#: wagtail_hooks.py:171
 #, python-format
 msgid "%(count)s image"
 msgid_plural "%(count)s images"
diff --git a/wagtail/search/locale/en/LC_MESSAGES/django.po b/wagtail/search/locale/en/LC_MESSAGES/django.po
index 77934e89a2..13721632d6 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: 2018-05-04 20:22+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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 70cd42e6f2..1f5328c907 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: 2018-05-04 20:22+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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"
@@ -66,12 +66,10 @@ msgid "Add site"
 msgstr ""
 
 #: views.py:19
-#, python-brace-format
 msgid "Site '{0}' created."
 msgstr ""
 
 #: views.py:24
-#, python-brace-format
 msgid "Site '{0}' updated."
 msgstr ""
 
@@ -84,7 +82,6 @@ msgid "Delete site"
 msgstr ""
 
 #: views.py:32
-#, python-brace-format
 msgid "Site '{0}' deleted."
 msgstr ""
 
diff --git a/wagtail/snippets/locale/en/LC_MESSAGES/django.po b/wagtail/snippets/locale/en/LC_MESSAGES/django.po
index aef76bedc4..190e6d0dbf 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: 2018-05-04 20:23+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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"
@@ -57,17 +57,17 @@ msgid ""
 "a>?"
 msgstr ""
 
-#: templates/wagtailsnippets/snippets/confirm_delete.html:3
-#, python-format
-msgid "Delete %(snippet_type_name)s - %(instance)s"
-msgstr ""
-
 #: templates/wagtailsnippets/snippets/confirm_delete.html:5
-#: templates/wagtailsnippets/snippets/edit.html:28
-msgid "Delete"
+#: templates/wagtailsnippets/snippets/type_index.html:40
+#, python-format
+msgid "Delete %(snippet_type_name)s"
 msgstr ""
 
-#: templates/wagtailsnippets/snippets/confirm_delete.html:12
+#: templates/wagtailsnippets/snippets/confirm_delete.html:11
+msgid "Delete "
+msgstr ""
+
+#: templates/wagtailsnippets/snippets/confirm_delete.html:23
 #: templates/wagtailsnippets/snippets/edit.html:42
 #, python-format
 msgid "Used %(usage_count)s time"
@@ -75,12 +75,17 @@ msgid_plural "Used %(usage_count)s times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/wagtailsnippets/snippets/confirm_delete.html:16
+#: templates/wagtailsnippets/snippets/confirm_delete.html:26
 #, python-format
 msgid "Are you sure you want to delete this %(snippet_type_name)s?"
 msgstr ""
 
-#: templates/wagtailsnippets/snippets/confirm_delete.html:19
+#: templates/wagtailsnippets/snippets/confirm_delete.html:28
+#, python-format
+msgid "Are you sure you want to delete %(count)s %(snippet_type_name)s?"
+msgstr ""
+
+#: templates/wagtailsnippets/snippets/confirm_delete.html:37
 msgid "Yes, delete"
 msgstr ""
 
@@ -112,16 +117,20 @@ msgstr ""
 msgid "Editing"
 msgstr ""
 
+#: templates/wagtailsnippets/snippets/edit.html:28
+msgid "Delete"
+msgstr ""
+
 #: templates/wagtailsnippets/snippets/edit.html:40
 msgid "Usage"
 msgstr ""
 
 #: templates/wagtailsnippets/snippets/index.html:3
-#: templates/wagtailsnippets/snippets/index.html:5 wagtail_hooks.py:31
+#: templates/wagtailsnippets/snippets/index.html:5 wagtail_hooks.py:30
 msgid "Snippets"
 msgstr ""
 
-#: templates/wagtailsnippets/snippets/list.html:8
+#: templates/wagtailsnippets/snippets/list.html:10
 #: templates/wagtailsnippets/snippets/usage.html:16
 msgid "Title"
 msgstr ""
@@ -138,12 +147,12 @@ msgstr ""
 msgid "Snippets %(snippet_type_name_plural)s"
 msgstr ""
 
-#: templates/wagtailsnippets/snippets/type_index.html:22
+#: templates/wagtailsnippets/snippets/type_index.html:25
 #, python-format
 msgid "Snippets <span>%(snippet_type_name_plural)s</span>"
 msgstr ""
 
-#: templates/wagtailsnippets/snippets/type_index.html:37
+#: templates/wagtailsnippets/snippets/type_index.html:43
 #, python-format
 msgid "Add %(snippet_type_name)s"
 msgstr ""
@@ -173,39 +182,40 @@ msgstr ""
 msgid "Edit this page"
 msgstr ""
 
-#: views/chooser.py:31 views/chooser.py:43 views/snippets.py:88
-#: views/snippets.py:100
+#: views/chooser.py:29 views/chooser.py:41 views/snippets.py:90
+#: views/snippets.py:102
 #, python-format
 msgid "Search %(snippet_type_name)s"
 msgstr ""
 
-#: views/snippets.py:142
-#, python-brace-format
+#: views/snippets.py:145
 msgid "{snippet_type} '{instance}' created."
 msgstr ""
 
-#: views/snippets.py:149 views/snippets.py:199
+#: views/snippets.py:152 views/snippets.py:202
 msgid "Edit"
 msgstr ""
 
-#: views/snippets.py:155
+#: views/snippets.py:158
 msgid "The snippet could not be created due to errors."
 msgstr ""
 
-#: views/snippets.py:192
-#, python-brace-format
+#: views/snippets.py:195
 msgid "{snippet_type} '{instance}' updated."
 msgstr ""
 
-#: views/snippets.py:205
+#: views/snippets.py:208
 msgid "The snippet could not be saved due to errors."
 msgstr ""
 
-#: views/snippets.py:237
-#, python-brace-format
+#: views/snippets.py:247
 msgid "{snippet_type} '{instance}' deleted."
 msgstr ""
 
+#: views/snippets.py:252
+msgid "{count} {snippet_type} deleted."
+msgstr ""
+
 #: widgets.py:14
 #, python-format
 msgid "Choose %s"
diff --git a/wagtail/users/locale/en/LC_MESSAGES/django.po b/wagtail/users/locale/en/LC_MESSAGES/django.po
index 84d4507234..e8f0106e2b 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: 2018-05-04 20:22+0100\n"
+"POT-Creation-Date: 2018-07-30 17:31+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"
@@ -37,7 +37,7 @@ msgstr ""
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: forms.py:79 forms.py:400
+#: forms.py:79 forms.py:405
 msgid "Email"
 msgstr ""
 
@@ -81,7 +81,15 @@ msgstr ""
 msgid "You cannot have multiple permission records for the same page."
 msgstr ""
 
-#: forms.py:426
+#: forms.py:396
+msgid "Preferred language"
+msgstr ""
+
+#: forms.py:422
+msgid "Current time zone"
+msgstr ""
+
+#: forms.py:432
 msgid "Upload a profile picture"
 msgstr ""
 
@@ -135,8 +143,8 @@ msgstr ""
 
 #: templates/wagtailusers/groups/confirm_delete.html:3
 #: templates/wagtailusers/groups/confirm_delete.html:6
-#: templates/wagtailusers/groups/edit.html:36 views/groups.py:96
-#: views/groups.py:122
+#: templates/wagtailusers/groups/edit.html:37 views/groups.py:107
+#: views/groups.py:144
 msgid "Delete group"
 msgstr ""
 
@@ -161,7 +169,7 @@ msgid ""
 "users."
 msgstr ""
 
-#: templates/wagtailusers/groups/confirm_delete.html:23 views/groups.py:123
+#: templates/wagtailusers/groups/confirm_delete.html:23 views/groups.py:145
 msgid "Are you sure you want to delete this group?"
 msgstr ""
 
@@ -171,19 +179,19 @@ msgid "Yes, delete"
 msgstr ""
 
 #: templates/wagtailusers/groups/create.html:4
-#: templates/wagtailusers/groups/create.html:14
-#: templates/wagtailusers/groups/create.html:31 views/groups.py:68
+#: templates/wagtailusers/groups/create.html:15
+#: templates/wagtailusers/groups/create.html:32 views/groups.py:68
 msgid "Add group"
 msgstr ""
 
 #: templates/wagtailusers/groups/edit.html:4
-#: templates/wagtailusers/groups/edit.html:14
+#: templates/wagtailusers/groups/edit.html:15
 #: templates/wagtailusers/users/edit.html:4
 #: templates/wagtailusers/users/edit.html:7
 msgid "Editing"
 msgstr ""
 
-#: templates/wagtailusers/groups/edit.html:33
+#: templates/wagtailusers/groups/edit.html:34
 #: templates/wagtailusers/users/edit.html:41
 #: templates/wagtailusers/users/edit.html:56
 msgid "Save"
@@ -347,21 +355,18 @@ msgid "Search groups"
 msgstr ""
 
 #: views/groups.py:69
-#, python-brace-format
 msgid "Group '{0}' created."
 msgstr ""
 
-#: views/groups.py:94
-#, python-brace-format
+#: views/groups.py:105
 msgid "Group '{0}' updated."
 msgstr ""
 
-#: views/groups.py:95
+#: views/groups.py:106
 msgid "The group could not be saved due to errors."
 msgstr ""
 
-#: views/groups.py:121
-#, python-brace-format
+#: views/groups.py:143
 msgid "Group '{0}' deleted."
 msgstr ""
 
@@ -370,7 +375,6 @@ msgid "Search users"
 msgstr ""
 
 #: views/users.py:120
-#, python-brace-format
 msgid "User '{0}' created."
 msgstr ""
 
@@ -393,7 +397,6 @@ msgid "The user could not be saved due to errors."
 msgstr ""
 
 #: views/users.py:184
-#, python-brace-format
 msgid "User '{0}' deleted."
 msgstr ""