diff --git a/wagtail/wagtailsearch/locale/bg/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/bg/LC_MESSAGES/django.po
index 29d1bb6094..3bddd3064e 100644
--- a/wagtail/wagtailsearch/locale/bg/LC_MESSAGES/django.po
+++ b/wagtail/wagtailsearch/locale/bg/LC_MESSAGES/django.po
@@ -1,121 +1,143 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # LyuboslavPetrov <petrov.lyuboslav@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"POT-Creation-Date: 2014-07-11 10:54+0000\n"
 "PO-Revision-Date: 2014-03-14 21:12+0000\n"
 "Last-Translator: serafeim <serafeim@torchbox.com>\n"
-"Language-Team: Bulgarian (http://www.transifex.com/projects/p/wagtail/language/bg/)\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/wagtail/"
+"language/bg/)\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\forms.py:8
+#: forms.py:9
 msgid "Search term(s)/phrase"
 msgstr "Дума/Фраза за търсене"
 
-#: .\forms.py:9
+#: forms.py:10
 msgid ""
 "Enter the full search string to match. An \n"
 "        exact match is required for your Editors Picks to be \n"
 "        displayed, wildcards are NOT allowed."
-msgstr "Въведете целият стринг. Точно \n        съвпадение е нужно за вашите \"Избрано от Редактора\" \n        да бъдат показани, като wildcards НЕ са позволени."
+msgstr ""
+"Въведете целият стринг. Точно \n"
+"        съвпадение е нужно за вашите \"Избрано от Редактора\" \n"
+"        да бъдат показани, като wildcards НЕ са позволени."
 
-#: .\templates\wagtailsearch\editorspicks\add.html:3
-#: .\templates\wagtailsearch\editorspicks\add.html:5
+#: forms.py:36
+msgid "Please specify at least one recommendation for this search term."
+msgstr ""
+
+#: wagtail_hooks.py:22 templates/wagtailsearch/editorspicks/list.html:9
+msgid "Editors picks"
+msgstr "Избрано от Редактора"
+
+#: templates/wagtailsearch/editorspicks/add.html:3
+#: templates/wagtailsearch/editorspicks/add.html:5
 msgid "Add editor's pick"
 msgstr "Добави \"Избрано от Редактора\""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:9
+#: templates/wagtailsearch/editorspicks/add.html:9
 msgid ""
 "\n"
-"        <p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like \"<em>giving</em>\".</p>\n"
+"        <p>Editors picks are a means of recommending specific pages that "
+"might not organically come high up in search results. E.g recommending your "
+"primary donation page to a user searching with a less common term like "
+"\"<em>giving</em>\".</p>\n"
+"        "
+msgstr ""
+"\n"
+"        <p>\"Избор на Редактора\" са средство за препоръчване на специфични "
+"страници, които не биха могли да дойдат по нормален начин високо в "
+"резултатите от търсенето. Например, препоръка към основната ви страница за "
+"дарения на потребителско търсене с по-малко общ термин като \"<em> даде </em>"
+"\". </p>\n"
 "        "
-msgstr "\n        <p>\"Избор на Редактора\" са средство за препоръчване на специфични страници, които не биха могли да дойдат по нормален начин високо в резултатите от търсенето. Например, препоръка към основната ви страница за дарения на потребителско търсене с по-малко общ термин като \"<em> даде </em>\". </p>\n        "
 
-#: .\templates\wagtailsearch\editorspicks\add.html:12
+#: templates/wagtailsearch/editorspicks/add.html:12
 msgid ""
 "\n"
-"        <p>The \"Search term(s)/phrase\" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>\n"
+"        <p>The \"Search term(s)/phrase\" field below must contain the full "
+"and exact search for which you wish to provide recommended results, "
+"<em>including</em> any misspellings/user error. To help, you can choose from "
+"search terms that have been popular with users of your site.</p>\n"
 "        "
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:25
-#: .\templates\wagtailsearch\editorspicks\edit.html:19
+#: templates/wagtailsearch/editorspicks/add.html:25
+#: templates/wagtailsearch/editorspicks/edit.html:19
 msgid "Save"
 msgstr "Запази"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr "Изтрий %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:5
-#: .\templates\wagtailsearch\editorspicks\edit.html:20
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:6
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:20
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:6
 msgid "Delete"
 msgstr "Изтрий"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:9
-msgid ""
-"Are you sure you want to delete all editors picks for this search term?"
-msgstr "Сигурен ли сте, че искате да изтриете всички \"Избрано от Редактора\" за тази ключова дума?"
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:9
+msgid "Are you sure you want to delete all editors picks for this search term?"
+msgstr ""
+"Сигурен ли сте, че искате да изтриете всички \"Избрано от Редактора\" за "
+"тази ключова дума?"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:12
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:12
 msgid "Yes, delete"
 msgstr "Да, изтрий го"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#: templates/wagtailsearch/editorspicks/edit.html:3
 #, python-format
 msgid "Editing %(query)s"
 msgstr "Редакция на %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:5
 msgid "Editing"
 msgstr "Редактиране"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:3
+#: templates/wagtailsearch/editorspicks/index.html:3
 msgid "Search Terms"
 msgstr "Фрази за търсене"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:17
+#: templates/wagtailsearch/editorspicks/index.html:17
 msgid "Editor's search picks"
 msgstr "\"Избрани от Редактора\" думи за търсене"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:18
+#: templates/wagtailsearch/editorspicks/index.html:18
 msgid "Add new editor's pick"
 msgstr "Добави \"Избрано от Редактора\""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:8
+#: templates/wagtailsearch/editorspicks/list.html:8
 msgid "Search term(s)"
 msgstr "Дума/Фраза за търсене"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:9
-msgid "Editors picks"
-msgstr "Избрано от Редактора"
-
-#: .\templates\wagtailsearch\editorspicks\list.html:10
-#: .\templates\wagtailsearch\queries\chooser\results.html:9
+#: templates/wagtailsearch/editorspicks/list.html:10
+#: templates/wagtailsearch/queries/chooser/results.html:8
 msgid "Views (past week)"
 msgstr "Преглед (последната седмица)"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:17
+#: templates/wagtailsearch/editorspicks/list.html:17
 msgid "Edit this pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:23
+#: templates/wagtailsearch/editorspicks/list.html:23
 msgid "None"
 msgstr "Нищо"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:5
+#: templates/wagtailsearch/editorspicks/results.html:5
 #, python-format
 msgid ""
 "\n"
@@ -125,65 +147,79 @@ msgid_plural ""
 "\n"
 "            There are %(counter)s matches\n"
 "        "
-msgstr[0] "\n            Има едно съвпадение\n        "
-msgstr[1] "\n            Има %(counter)s съвпадения\n        "
+msgstr[0] ""
+"\n"
+"            Има едно съвпадение\n"
+"        "
+msgstr[1] ""
+"\n"
+"            Има %(counter)s съвпадения\n"
+"        "
 
-#: .\templates\wagtailsearch\editorspicks\results.html:18
+#: templates/wagtailsearch/editorspicks/results.html:18
 #, python-format
 msgid "Sorry, no editor's picks match \"<em>%(query_string)s</em>\""
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:21
+#: templates/wagtailsearch/editorspicks/results.html:21
 #, python-format
 msgid ""
-"No editor's picks have been created. Why not <a "
-"href=\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
+"No editor's picks have been created. Why not <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:4
 msgid "Move up"
 msgstr "Нагоре"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:5
 msgid "Move down"
 msgstr "Надолу"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:10
 msgid "Editors pick"
 msgstr "Избрано от Редактора"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html:14
 msgid "Add recommended page"
 msgstr "Добави препоръчана страница"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+#: templates/wagtailsearch/queries/chooser/chooser.html:2
 msgid "Popular search terms"
 msgstr "Популярни думи за търсене"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+#: templates/wagtailsearch/queries/chooser/chooser.html:11
 msgid "Search"
 msgstr "Търсене"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:8
+#: templates/wagtailsearch/queries/chooser/results.html:7
 msgid "Terms"
 msgstr "Думи"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:23
+#: templates/wagtailsearch/queries/chooser/results.html:22
 msgid "No results found"
 msgstr "Не са намерени резултати"
 
-#: .\views\editorspicks.py:41
+#: views/editorspicks.py:47
 msgid "Search editor's picks"
 msgstr ""
 
-#: .\views\editorspicks.py:75
+#: views/editorspicks.py:83
 msgid "Editor's picks for '{0}' created."
 msgstr ""
 
-#: .\views\editorspicks.py:103
+#: views/editorspicks.py:89
+msgid "Recommendations have not been created due to errors"
+msgstr ""
+
+#: views/editorspicks.py:117
 msgid "Editor's picks for '{0}' updated."
 msgstr ""
 
-#: .\views\editorspicks.py:122
+#: views/editorspicks.py:123
+msgid "Recommendations have not been saved due to errors"
+msgstr ""
+
+#: views/editorspicks.py:142
 msgid "Editor's picks deleted."
 msgstr ""
diff --git a/wagtail/wagtailsearch/locale/ca/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/ca/LC_MESSAGES/django.po
index 1a6e742570..291cb8fe4d 100644
--- a/wagtail/wagtailsearch/locale/ca/LC_MESSAGES/django.po
+++ b/wagtail/wagtailsearch/locale/ca/LC_MESSAGES/django.po
@@ -1,121 +1,148 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Lloople <d.lloople@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"POT-Creation-Date: 2014-07-11 10:54+0000\n"
 "PO-Revision-Date: 2014-03-14 21:59+0000\n"
 "Last-Translator: Lloople <d.lloople@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/wagtail/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/wagtail/language/"
+"ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\forms.py:8
+#: forms.py:9
 msgid "Search term(s)/phrase"
 msgstr "Cerca paraula(es)/frases"
 
-#: .\forms.py:9
+#: forms.py:10
 msgid ""
 "Enter the full search string to match. An \n"
 "        exact match is required for your Editors Picks to be \n"
 "        displayed, wildcards are NOT allowed."
-msgstr "Escriu el text a cercar. Una\ncoincidència exacta és requerida per les teves seleccions dels editors per ser\nmostrades, les wildcars NO estan permeses."
+msgstr ""
+"Escriu el text a cercar. Una\n"
+"coincidència exacta és requerida per les teves seleccions dels editors per "
+"ser\n"
+"mostrades, les wildcars NO estan permeses."
 
-#: .\templates\wagtailsearch\editorspicks\add.html:3
-#: .\templates\wagtailsearch\editorspicks\add.html:5
+#: forms.py:36
+msgid "Please specify at least one recommendation for this search term."
+msgstr ""
+
+#: wagtail_hooks.py:22 templates/wagtailsearch/editorspicks/list.html:9
+msgid "Editors picks"
+msgstr "Selecció dels editors"
+
+#: templates/wagtailsearch/editorspicks/add.html:3
+#: templates/wagtailsearch/editorspicks/add.html:5
 msgid "Add editor's pick"
 msgstr "afegeix selecció dels editors"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:9
+#: templates/wagtailsearch/editorspicks/add.html:9
 msgid ""
 "\n"
-"        <p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like \"<em>giving</em>\".</p>\n"
+"        <p>Editors picks are a means of recommending specific pages that "
+"might not organically come high up in search results. E.g recommending your "
+"primary donation page to a user searching with a less common term like "
+"\"<em>giving</em>\".</p>\n"
 "        "
-msgstr "\n<p>Les seleccions dels editors són una mena de recomanacions de pàgines específiques que no puguin aparèixer orgànicament als resultats de cerca. Per exemple, recomanant la teva pàgina principal de donacions en un termini de cerca comú com \"<em>donar</em>\".</p>"
+msgstr ""
+"\n"
+"<p>Les seleccions dels editors són una mena de recomanacions de pàgines "
+"específiques que no puguin aparèixer orgànicament als resultats de cerca. "
+"Per exemple, recomanant la teva pàgina principal de donacions en un termini "
+"de cerca comú com \"<em>donar</em>\".</p>"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:12
+#: templates/wagtailsearch/editorspicks/add.html:12
 msgid ""
 "\n"
-"        <p>The \"Search term(s)/phrase\" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>\n"
+"        <p>The \"Search term(s)/phrase\" field below must contain the full "
+"and exact search for which you wish to provide recommended results, "
+"<em>including</em> any misspellings/user error. To help, you can choose from "
+"search terms that have been popular with users of your site.</p>\n"
 "        "
-msgstr "\n<p>El camp \"Cerca paraula(es)/frases\" de sota ha de contenir la cerca completa i exacta per al que vols proveïr resultats recomanats, <em>inclöent</em> qualsevol error dels usuaris. Per ajugar, pots escollir des dels terminis de cerca que s'han fet populars a través dels usuaris del teu lloc.</p>"
+msgstr ""
+"\n"
+"<p>El camp \"Cerca paraula(es)/frases\" de sota ha de contenir la cerca "
+"completa i exacta per al que vols proveïr resultats recomanats, "
+"<em>inclöent</em> qualsevol error dels usuaris. Per ajugar, pots escollir "
+"des dels terminis de cerca que s'han fet populars a través dels usuaris del "
+"teu lloc.</p>"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:25
-#: .\templates\wagtailsearch\editorspicks\edit.html:19
+#: templates/wagtailsearch/editorspicks/add.html:25
+#: templates/wagtailsearch/editorspicks/edit.html:19
 msgid "Save"
 msgstr "Desa"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr "Esborra %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:5
-#: .\templates\wagtailsearch\editorspicks\edit.html:20
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:6
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:20
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:6
 msgid "Delete"
 msgstr "Esborra"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:9
-msgid ""
-"Are you sure you want to delete all editors picks for this search term?"
-msgstr "Estàs segur que vols esborrar totes les seleccions dels editors per aquest terme de cerca?"
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:9
+msgid "Are you sure you want to delete all editors picks for this search term?"
+msgstr ""
+"Estàs segur que vols esborrar totes les seleccions dels editors per aquest "
+"terme de cerca?"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:12
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:12
 msgid "Yes, delete"
 msgstr "Si, esborra"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#: templates/wagtailsearch/editorspicks/edit.html:3
 #, python-format
 msgid "Editing %(query)s"
 msgstr "Editant %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:5
 msgid "Editing"
 msgstr "Editant"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:3
+#: templates/wagtailsearch/editorspicks/index.html:3
 msgid "Search Terms"
 msgstr "Termini de cerca"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:17
+#: templates/wagtailsearch/editorspicks/index.html:17
 msgid "Editor's search picks"
 msgstr "Cercar seleccions dels editors"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:18
+#: templates/wagtailsearch/editorspicks/index.html:18
 msgid "Add new editor's pick"
 msgstr "Afegeix una nova selecció de l'editor"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:8
+#: templates/wagtailsearch/editorspicks/list.html:8
 msgid "Search term(s)"
 msgstr "Cerca paraula(es)"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:9
-msgid "Editors picks"
-msgstr "Selecció dels editors"
-
-#: .\templates\wagtailsearch\editorspicks\list.html:10
-#: .\templates\wagtailsearch\queries\chooser\results.html:9
+#: templates/wagtailsearch/editorspicks/list.html:10
+#: templates/wagtailsearch/queries/chooser/results.html:8
 msgid "Views (past week)"
 msgstr "Vistes(la setmana pasada)"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:17
+#: templates/wagtailsearch/editorspicks/list.html:17
 msgid "Edit this pick"
 msgstr "Edita aquesta selecció"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:23
+#: templates/wagtailsearch/editorspicks/list.html:23
 msgid "None"
 msgstr "Cap"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:5
+#: templates/wagtailsearch/editorspicks/results.html:5
 #, python-format
 msgid ""
 "\n"
@@ -125,65 +152,80 @@ msgid_plural ""
 "\n"
 "            There are %(counter)s matches\n"
 "        "
-msgstr[0] "\nHi ha una coincidència"
-msgstr[1] "\nHi han %(counter)s coincidències"
+msgstr[0] ""
+"\n"
+"Hi ha una coincidència"
+msgstr[1] ""
+"\n"
+"Hi han %(counter)s coincidències"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:18
+#: templates/wagtailsearch/editorspicks/results.html:18
 #, python-format
 msgid "Sorry, no editor's picks match \"<em>%(query_string)s</em>\""
-msgstr "Ho sentim, cap selecció d'editor coincideix amb \"<em>%(query_string)s</em>\""
+msgstr ""
+"Ho sentim, cap selecció d'editor coincideix amb \"<em>%(query_string)s</em>\""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:21
+#: templates/wagtailsearch/editorspicks/results.html:21
 #, python-format
 msgid ""
-"No editor's picks have been created. Why not <a "
-"href=\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
-msgstr "Encara no s'ha creat cap selecció d'editor. Per què no <a href=\"%(wagtailsearch_editorspicks_add_url)s\">afegeixes una</a>?"
+"No editor's picks have been created. Why not <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
+msgstr ""
+"Encara no s'ha creat cap selecció d'editor. Per què no <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">afegeixes una</a>?"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:4
 msgid "Move up"
 msgstr "Puja"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:5
 msgid "Move down"
 msgstr "Baixa"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:10
 msgid "Editors pick"
 msgstr "Selecció dels editors"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html:14
 msgid "Add recommended page"
 msgstr "Afegeix una pàgina recomanada"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+#: templates/wagtailsearch/queries/chooser/chooser.html:2
 msgid "Popular search terms"
 msgstr "terminis de cerca populars"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+#: templates/wagtailsearch/queries/chooser/chooser.html:11
 msgid "Search"
 msgstr "Cercar"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:8
+#: templates/wagtailsearch/queries/chooser/results.html:7
 msgid "Terms"
 msgstr "Termes"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:23
+#: templates/wagtailsearch/queries/chooser/results.html:22
 msgid "No results found"
 msgstr "No s'han trobat resultats"
 
-#: .\views\editorspicks.py:41
+#: views/editorspicks.py:47
 msgid "Search editor's picks"
 msgstr "Cercar selecció del editor"
 
-#: .\views\editorspicks.py:75
+#: views/editorspicks.py:83
 msgid "Editor's picks for '{0}' created."
 msgstr "Selecció de l'editor per a '{0}' creada."
 
-#: .\views\editorspicks.py:103
+#: views/editorspicks.py:89
+msgid "Recommendations have not been created due to errors"
+msgstr ""
+
+#: views/editorspicks.py:117
 msgid "Editor's picks for '{0}' updated."
 msgstr "Selecció de l'editor per '{0}' actualitzada."
 
-#: .\views\editorspicks.py:122
+#: views/editorspicks.py:123
+msgid "Recommendations have not been saved due to errors"
+msgstr ""
+
+#: views/editorspicks.py:142
 msgid "Editor's picks deleted."
 msgstr "Selecció de l'editor esborrada."
diff --git a/wagtail/wagtailsearch/locale/de/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/de/LC_MESSAGES/django.po
index 4d53e83bad..767b6555fc 100644
--- a/wagtail/wagtailsearch/locale/de/LC_MESSAGES/django.po
+++ b/wagtail/wagtailsearch/locale/de/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # jspielmann <j@spielmannsolutions.com>, 2014
 # pcraston <patrick@craston.com>, 2014
@@ -9,114 +9,141 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"POT-Creation-Date: 2014-07-11 10:54+0000\n"
 "PO-Revision-Date: 2014-03-24 19:02+0000\n"
 "Last-Translator: pcraston <patrick@craston.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/wagtail/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/wagtail/language/"
+"de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\forms.py:8
+#: forms.py:9
 msgid "Search term(s)/phrase"
 msgstr "Suchbegriffe/Phrase"
 
-#: .\forms.py:9
+#: forms.py:10
 msgid ""
 "Enter the full search string to match. An \n"
 "        exact match is required for your Editors Picks to be \n"
 "        displayed, wildcards are NOT allowed."
-msgstr "Geben Sie den vollständigen Suchbegriff ein! Um Ihre Redaktionsempfehlungen anzuzeigen wird eine genaue Übereinstimmung benötigt. Wildcards sind NICHT erlaubt."
+msgstr ""
+"Geben Sie den vollständigen Suchbegriff ein! Um Ihre Redaktionsempfehlungen "
+"anzuzeigen wird eine genaue Übereinstimmung benötigt. Wildcards sind NICHT "
+"erlaubt."
 
-#: .\templates\wagtailsearch\editorspicks\add.html:3
-#: .\templates\wagtailsearch\editorspicks\add.html:5
+#: forms.py:36
+msgid "Please specify at least one recommendation for this search term."
+msgstr ""
+
+#: wagtail_hooks.py:22 templates/wagtailsearch/editorspicks/list.html:9
+msgid "Editors picks"
+msgstr "Redaktionsempfehlungen"
+
+#: templates/wagtailsearch/editorspicks/add.html:3
+#: templates/wagtailsearch/editorspicks/add.html:5
 msgid "Add editor's pick"
 msgstr "Redaktionsempfehlung hinzufügen"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:9
+#: templates/wagtailsearch/editorspicks/add.html:9
 msgid ""
 "\n"
-"        <p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like \"<em>giving</em>\".</p>\n"
+"        <p>Editors picks are a means of recommending specific pages that "
+"might not organically come high up in search results. E.g recommending your "
+"primary donation page to a user searching with a less common term like "
+"\"<em>giving</em>\".</p>\n"
+"        "
+msgstr ""
+"\n"
+"        <p>Redaktionsempfehlungen sind eine Möglichkeit, bestimmte Seiten zu "
+"empfehlen die von sich aus nicht sehr weit oben in den Suchergebnissen "
+"auftauchen würden. So könnte zum Beispiel Ihre Spendenseite auftauchen wenn "
+"nach dem Suchbegriff \"<em>unterstützen</em>\" gesucht wird.</p>\n"
 "        "
-msgstr "\n        <p>Redaktionsempfehlungen sind eine Möglichkeit, bestimmte Seiten zu empfehlen die von sich aus nicht sehr weit oben in den Suchergebnissen auftauchen würden. So könnte zum Beispiel Ihre Spendenseite auftauchen wenn nach dem Suchbegriff \"<em>unterstützen</em>\" gesucht wird.</p>\n        "
 
-#: .\templates\wagtailsearch\editorspicks\add.html:12
+#: templates/wagtailsearch/editorspicks/add.html:12
 msgid ""
 "\n"
-"        <p>The \"Search term(s)/phrase\" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>\n"
+"        <p>The \"Search term(s)/phrase\" field below must contain the full "
+"and exact search for which you wish to provide recommended results, "
+"<em>including</em> any misspellings/user error. To help, you can choose from "
+"search terms that have been popular with users of your site.</p>\n"
+"        "
+msgstr ""
+"\n"
+"        <p>Im Eingabefeld \"Suchbegriffe/Phrasen\" müssen Sie den "
+"vollständigen und genauen Suchbegriff, inklusive eventueller "
+"Rechtschreibfehler, eingeben, für den Sie Seiten empfehlen möchten. Zur "
+"Unterstützung können Sie aus häufig verwendeten Suchbegriffen wählen.</p>\n"
 "        "
-msgstr "\n        <p>Im Eingabefeld \"Suchbegriffe/Phrasen\" müssen Sie den vollständigen und genauen Suchbegriff, inklusive eventueller Rechtschreibfehler, eingeben, für den Sie Seiten empfehlen möchten. Zur Unterstützung können Sie aus häufig verwendeten Suchbegriffen wählen.</p>\n        "
 
-#: .\templates\wagtailsearch\editorspicks\add.html:25
-#: .\templates\wagtailsearch\editorspicks\edit.html:19
+#: templates/wagtailsearch/editorspicks/add.html:25
+#: templates/wagtailsearch/editorspicks/edit.html:19
 msgid "Save"
 msgstr "Speichern"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr "%(query)s löschen"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:5
-#: .\templates\wagtailsearch\editorspicks\edit.html:20
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:6
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:20
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:6
 msgid "Delete"
 msgstr "Löschen"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:9
-msgid ""
-"Are you sure you want to delete all editors picks for this search term?"
-msgstr "Sind Sie sicher, dass Sie alle Redaktionsempfehlungen für diesen Suchbegriff löschen wollen?"
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:9
+msgid "Are you sure you want to delete all editors picks for this search term?"
+msgstr ""
+"Sind Sie sicher, dass Sie alle Redaktionsempfehlungen für diesen Suchbegriff "
+"löschen wollen?"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:12
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:12
 msgid "Yes, delete"
 msgstr "Ja, löschen"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#: templates/wagtailsearch/editorspicks/edit.html:3
 #, python-format
 msgid "Editing %(query)s"
 msgstr "%(query)s bearbeiten"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:5
 msgid "Editing"
 msgstr "Bearbeiten"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:3
+#: templates/wagtailsearch/editorspicks/index.html:3
 msgid "Search Terms"
 msgstr "Suchbegriffe"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:17
+#: templates/wagtailsearch/editorspicks/index.html:17
 msgid "Editor's search picks"
 msgstr "Redaktionsempfehlungen für die Suche"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:18
+#: templates/wagtailsearch/editorspicks/index.html:18
 msgid "Add new editor's pick"
 msgstr "Neue Redaktionsempfehlung hinzufügen"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:8
+#: templates/wagtailsearch/editorspicks/list.html:8
 msgid "Search term(s)"
 msgstr "Suchbegriff/e"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:9
-msgid "Editors picks"
-msgstr "Redaktionsempfehlungen"
-
-#: .\templates\wagtailsearch\editorspicks\list.html:10
-#: .\templates\wagtailsearch\queries\chooser\results.html:9
+#: templates/wagtailsearch/editorspicks/list.html:10
+#: templates/wagtailsearch/queries/chooser/results.html:8
 msgid "Views (past week)"
 msgstr "Aufrufe (letze Woche)"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:17
+#: templates/wagtailsearch/editorspicks/list.html:17
 msgid "Edit this pick"
 msgstr "Diese Empfehlung bearbeiten"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:23
+#: templates/wagtailsearch/editorspicks/list.html:23
 msgid "None"
 msgstr "Keine"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:5
+#: templates/wagtailsearch/editorspicks/results.html:5
 #, python-format
 msgid ""
 "\n"
@@ -126,65 +153,83 @@ msgid_plural ""
 "\n"
 "            There are %(counter)s matches\n"
 "        "
-msgstr[0] "\n            Es gibt ein Ergebnis\n        "
-msgstr[1] "\n            Es gibt %(counter)s Ergebnisse\n        "
+msgstr[0] ""
+"\n"
+"            Es gibt ein Ergebnis\n"
+"        "
+msgstr[1] ""
+"\n"
+"            Es gibt %(counter)s Ergebnisse\n"
+"        "
 
-#: .\templates\wagtailsearch\editorspicks\results.html:18
+#: templates/wagtailsearch/editorspicks/results.html:18
 #, python-format
 msgid "Sorry, no editor's picks match \"<em>%(query_string)s</em>\""
-msgstr "Es wurde leider keine Redaktionsempfehlung zum Suchbegriff \"<em>%(query_string)s</em>\" gefunden"
+msgstr ""
+"Es wurde leider keine Redaktionsempfehlung zum Suchbegriff \"<em>"
+"%(query_string)s</em>\" gefunden"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:21
+#: templates/wagtailsearch/editorspicks/results.html:21
 #, python-format
 msgid ""
-"No editor's picks have been created. Why not <a "
-"href=\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
-msgstr "Sie haben noch keine Redaktionsempfehlungen erstellt. <a href=\"%(wagtailsearch_editorspicks_add_url)s\">Erstellen Sie doch jetzt eine!</a>"
+"No editor's picks have been created. Why not <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
+msgstr ""
+"Sie haben noch keine Redaktionsempfehlungen erstellt. <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">Erstellen Sie doch jetzt eine!</a>"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:4
 msgid "Move up"
 msgstr "Nach oben"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:5
 msgid "Move down"
 msgstr "Nach unten"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:10
 msgid "Editors pick"
 msgstr "Redaktionsempfehlung"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html:14
 msgid "Add recommended page"
 msgstr "Empfohlene Seite hinzufügen"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+#: templates/wagtailsearch/queries/chooser/chooser.html:2
 msgid "Popular search terms"
 msgstr "Häufige Suchbegriffe"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+#: templates/wagtailsearch/queries/chooser/chooser.html:11
 msgid "Search"
 msgstr "Suche"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:8
+#: templates/wagtailsearch/queries/chooser/results.html:7
 msgid "Terms"
 msgstr "Begriffe"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:23
+#: templates/wagtailsearch/queries/chooser/results.html:22
 msgid "No results found"
 msgstr "Keine Ergebnisse gefunden"
 
-#: .\views\editorspicks.py:41
+#: views/editorspicks.py:47
 msgid "Search editor's picks"
 msgstr "Nach Redaktionsempfehlungen suchen"
 
-#: .\views\editorspicks.py:75
+#: views/editorspicks.py:83
 msgid "Editor's picks for '{0}' created."
 msgstr "Redaktionsempfehlungen für '{0}' erstellt."
 
-#: .\views\editorspicks.py:103
+#: views/editorspicks.py:89
+msgid "Recommendations have not been created due to errors"
+msgstr ""
+
+#: views/editorspicks.py:117
 msgid "Editor's picks for '{0}' updated."
 msgstr "Redaktionsempfehlungen für '{0}' geändert."
 
-#: .\views\editorspicks.py:122
+#: views/editorspicks.py:123
+msgid "Recommendations have not been saved due to errors"
+msgstr ""
+
+#: views/editorspicks.py:142
 msgid "Editor's picks deleted."
 msgstr "Redaktionsempfehlungen gelöscht."
diff --git a/wagtail/wagtailsearch/locale/el/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/el/LC_MESSAGES/django.po
index b2a890050c..f8a010959b 100644
--- a/wagtail/wagtailsearch/locale/el/LC_MESSAGES/django.po
+++ b/wagtail/wagtailsearch/locale/el/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # serafeim <serafeim@torchbox.com>, 2014
 # serafeim <serafeim@torchbox.com>, 2014
@@ -9,114 +9,142 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"POT-Creation-Date: 2014-07-11 10:54+0000\n"
 "PO-Revision-Date: 2014-03-14 21:15+0000\n"
 "Last-Translator: serafeim <serafeim@torchbox.com>\n"
-"Language-Team: Greek (http://www.transifex.com/projects/p/wagtail/language/el/)\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/wagtail/language/"
+"el/)\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\forms.py:8
+#: forms.py:9
 msgid "Search term(s)/phrase"
 msgstr "Όροι/φράση αναζήτησης"
 
-#: .\forms.py:9
+#: forms.py:10
 msgid ""
 "Enter the full search string to match. An \n"
 "        exact match is required for your Editors Picks to be \n"
 "        displayed, wildcards are NOT allowed."
-msgstr "Συμπληρώσατε το πλήρες κείμενο προς αναζήτησης.\nΓια να εμφανιστεί η επιλογή των συντακτών σας\nαπαιτείται ακριβές ταίριασμα, δεν επιτρέπονται\nαστεράκια."
+msgstr ""
+"Συμπληρώσατε το πλήρες κείμενο προς αναζήτησης.\n"
+"Για να εμφανιστεί η επιλογή των συντακτών σας\n"
+"απαιτείται ακριβές ταίριασμα, δεν επιτρέπονται\n"
+"αστεράκια."
 
-#: .\templates\wagtailsearch\editorspicks\add.html:3
-#: .\templates\wagtailsearch\editorspicks\add.html:5
+#: forms.py:36
+msgid "Please specify at least one recommendation for this search term."
+msgstr ""
+
+#: wagtail_hooks.py:22 templates/wagtailsearch/editorspicks/list.html:9
+msgid "Editors picks"
+msgstr "Επιλογές συντακτών"
+
+#: templates/wagtailsearch/editorspicks/add.html:3
+#: templates/wagtailsearch/editorspicks/add.html:5
 msgid "Add editor's pick"
 msgstr "Προσθήκη επιλογής συντακτών"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:9
+#: templates/wagtailsearch/editorspicks/add.html:9
 msgid ""
 "\n"
-"        <p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like \"<em>giving</em>\".</p>\n"
+"        <p>Editors picks are a means of recommending specific pages that "
+"might not organically come high up in search results. E.g recommending your "
+"primary donation page to a user searching with a less common term like "
+"\"<em>giving</em>\".</p>\n"
 "        "
-msgstr "\n<p>Οι επιλογές συντακτών είναι ένας τρόπος πρότασης συγκεκριμένων σελίδων οι οποίες κανονικά δε θα βρίσκονται ψηλά στα αποτελέσματα της αναζήτησης. Για παράδειγμα, μπορείτε να προτείνετε τη σελίδα δωρεων σας σε μια αναζήτηση ενός λιγότερο συνηθισμένου όρου όπως  \"<em>δίνω</em>\".</p>"
+msgstr ""
+"\n"
+"<p>Οι επιλογές συντακτών είναι ένας τρόπος πρότασης συγκεκριμένων σελίδων οι "
+"οποίες κανονικά δε θα βρίσκονται ψηλά στα αποτελέσματα της αναζήτησης. Για "
+"παράδειγμα, μπορείτε να προτείνετε τη σελίδα δωρεων σας σε μια αναζήτηση "
+"ενός λιγότερο συνηθισμένου όρου όπως  \"<em>δίνω</em>\".</p>"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:12
+#: templates/wagtailsearch/editorspicks/add.html:12
 msgid ""
 "\n"
-"        <p>The \"Search term(s)/phrase\" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>\n"
+"        <p>The \"Search term(s)/phrase\" field below must contain the full "
+"and exact search for which you wish to provide recommended results, "
+"<em>including</em> any misspellings/user error. To help, you can choose from "
+"search terms that have been popular with users of your site.</p>\n"
 "        "
-msgstr "\n\n<p>Το πεδίο \"όροι/φράσεις αναζήτησης\" παρακάτω πρέπει να περιέχει το πλήρες και ακριβές κείμενο για το οποίο θέλετε να παρέχετε προτεινόμενα αποτελέσματα, <em>συμπεριλαμβανομένων</em> τυχόν ορθογραφικών λαθών. Προς βοήθεια, μπορείτε να επιλέξετε όρους αναζήτησης που ήταν δημοφιλείς στους χρήστες.</p>"
+msgstr ""
+"\n"
+"\n"
+"<p>Το πεδίο \"όροι/φράσεις αναζήτησης\" παρακάτω πρέπει να περιέχει το "
+"πλήρες και ακριβές κείμενο για το οποίο θέλετε να παρέχετε προτεινόμενα "
+"αποτελέσματα, <em>συμπεριλαμβανομένων</em> τυχόν ορθογραφικών λαθών. Προς "
+"βοήθεια, μπορείτε να επιλέξετε όρους αναζήτησης που ήταν δημοφιλείς στους "
+"χρήστες.</p>"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:25
-#: .\templates\wagtailsearch\editorspicks\edit.html:19
+#: templates/wagtailsearch/editorspicks/add.html:25
+#: templates/wagtailsearch/editorspicks/edit.html:19
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr "Διαγραφή %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:5
-#: .\templates\wagtailsearch\editorspicks\edit.html:20
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:6
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:20
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:6
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:9
-msgid ""
-"Are you sure you want to delete all editors picks for this search term?"
-msgstr "Είστε σίγουρος ότι θέλετε να διαγράψετε όλες τις επιλογές συντακτών για τον εν λόγω όρο αναζήτησης;"
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:9
+msgid "Are you sure you want to delete all editors picks for this search term?"
+msgstr ""
+"Είστε σίγουρος ότι θέλετε να διαγράψετε όλες τις επιλογές συντακτών για τον "
+"εν λόγω όρο αναζήτησης;"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:12
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:12
 msgid "Yes, delete"
 msgstr "Ναι, να διαγραφεί"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#: templates/wagtailsearch/editorspicks/edit.html:3
 #, python-format
 msgid "Editing %(query)s"
 msgstr "Επεξεργασία %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:5
 msgid "Editing"
 msgstr "Διόρθωση"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:3
+#: templates/wagtailsearch/editorspicks/index.html:3
 msgid "Search Terms"
 msgstr "Όροι αναζήτησης"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:17
+#: templates/wagtailsearch/editorspicks/index.html:17
 msgid "Editor's search picks"
 msgstr "Επιλογές συντακτών"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:18
+#: templates/wagtailsearch/editorspicks/index.html:18
 msgid "Add new editor's pick"
 msgstr "Προσθήκη νέας επιλογής συντακτών"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:8
+#: templates/wagtailsearch/editorspicks/list.html:8
 msgid "Search term(s)"
 msgstr "Όροι αναζήτησης"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:9
-msgid "Editors picks"
-msgstr "Επιλογές συντακτών"
-
-#: .\templates\wagtailsearch\editorspicks\list.html:10
-#: .\templates\wagtailsearch\queries\chooser\results.html:9
+#: templates/wagtailsearch/editorspicks/list.html:10
+#: templates/wagtailsearch/queries/chooser/results.html:8
 msgid "Views (past week)"
 msgstr "Εμφανίσεις (την περασμένη εβδομάδα)"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:17
+#: templates/wagtailsearch/editorspicks/list.html:17
 msgid "Edit this pick"
 msgstr "Διόρθωση"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:23
+#: templates/wagtailsearch/editorspicks/list.html:23
 msgid "None"
 msgstr "Καμία"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:5
+#: templates/wagtailsearch/editorspicks/results.html:5
 #, python-format
 msgid ""
 "\n"
@@ -126,65 +154,81 @@ msgid_plural ""
 "\n"
 "            There are %(counter)s matches\n"
 "        "
-msgstr[0] "\nΒρέθηκε ένα αποτέλεσμα"
-msgstr[1] "\nΒρέθηκαν %(counter)s αποτελέσματα"
+msgstr[0] ""
+"\n"
+"Βρέθηκε ένα αποτέλεσμα"
+msgstr[1] ""
+"\n"
+"Βρέθηκαν %(counter)s αποτελέσματα"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:18
+#: templates/wagtailsearch/editorspicks/results.html:18
 #, python-format
 msgid "Sorry, no editor's picks match \"<em>%(query_string)s</em>\""
-msgstr "Λυπούμαστε, δε ταιριάζουν επιλογές συντακτών με το \"<em>%(query_string)s</em>\""
+msgstr ""
+"Λυπούμαστε, δε ταιριάζουν επιλογές συντακτών με το \"<em>%(query_string)s</"
+"em>\""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:21
+#: templates/wagtailsearch/editorspicks/results.html:21
 #, python-format
 msgid ""
-"No editor's picks have been created. Why not <a "
-"href=\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
-msgstr "Δεν υπάρχουν επιλογές συντακτών. Θέλετε να <a href=\"%(wagtailsearch_editorspicks_add_url)s\">προσθέσετε μία</a>;"
+"No editor's picks have been created. Why not <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
+msgstr ""
+"Δεν υπάρχουν επιλογές συντακτών. Θέλετε να <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">προσθέσετε μία</a>;"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:4
 msgid "Move up"
 msgstr "Πάνω"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:5
 msgid "Move down"
 msgstr "Κάτω"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:10
 msgid "Editors pick"
 msgstr "Επιλογή συντακτών"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html:14
 msgid "Add recommended page"
 msgstr "Προσθήκη προτεινόμενης σελίδας"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+#: templates/wagtailsearch/queries/chooser/chooser.html:2
 msgid "Popular search terms"
 msgstr "Δημοφιλείς όροι αναζήτησης"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+#: templates/wagtailsearch/queries/chooser/chooser.html:11
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:8
+#: templates/wagtailsearch/queries/chooser/results.html:7
 msgid "Terms"
 msgstr "Όροι"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:23
+#: templates/wagtailsearch/queries/chooser/results.html:22
 msgid "No results found"
 msgstr "Δε βρέθηκαν αποτελέσματα"
 
-#: .\views\editorspicks.py:41
+#: views/editorspicks.py:47
 msgid "Search editor's picks"
 msgstr "Αναζήτηση επιλογών συντακτών"
 
-#: .\views\editorspicks.py:75
+#: views/editorspicks.py:83
 msgid "Editor's picks for '{0}' created."
 msgstr "Επιτυχής δημιουργία επιλογή συντακτών για το '{0}'."
 
-#: .\views\editorspicks.py:103
+#: views/editorspicks.py:89
+msgid "Recommendations have not been created due to errors"
+msgstr ""
+
+#: views/editorspicks.py:117
 msgid "Editor's picks for '{0}' updated."
 msgstr "Επιτυχής διόθρωση επιλογής συντακτών για το '{0}'."
 
-#: .\views\editorspicks.py:122
+#: views/editorspicks.py:123
+msgid "Recommendations have not been saved due to errors"
+msgstr ""
+
+#: views/editorspicks.py:142
 msgid "Editor's picks deleted."
 msgstr "Επιτυχής διαγραφή επιλογής συντακτών."
diff --git a/wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.po
index 10e0f02e93..5db43c886c 100644
--- a/wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.po
+++ b/wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.po
@@ -8,31 +8,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"POT-Creation-Date: 2014-07-11 10:54+0000\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .\forms.py:8
+#: forms.py:9
 msgid "Search term(s)/phrase"
 msgstr ""
 
-#: .\forms.py:9
+#: forms.py:10
 msgid ""
 "Enter the full search string to match. An \n"
 "        exact match is required for your Editors Picks to be \n"
 "        displayed, wildcards are NOT allowed."
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:3
-#: .\templates\wagtailsearch\editorspicks\add.html:5
+#: forms.py:36
+msgid "Please specify at least one recommendation for this search term."
+msgstr ""
+
+#: wagtail_hooks.py:22 templates/wagtailsearch/editorspicks/list.html:9
+msgid "Editors picks"
+msgstr ""
+
+#: templates/wagtailsearch/editorspicks/add.html:3
+#: templates/wagtailsearch/editorspicks/add.html:5
 msgid "Add editor's pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:9
+#: templates/wagtailsearch/editorspicks/add.html:9
 msgid ""
 "\n"
 "        <p>Editors picks are a means of recommending specific pages that "
@@ -42,7 +51,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:12
+#: templates/wagtailsearch/editorspicks/add.html:12
 msgid ""
 "\n"
 "        <p>The \"Search term(s)/phrase\" field below must contain the full "
@@ -52,73 +61,69 @@ msgid ""
 "        "
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:25
-#: .\templates\wagtailsearch\editorspicks\edit.html:19
+#: templates/wagtailsearch/editorspicks/add.html:25
+#: templates/wagtailsearch/editorspicks/edit.html:19
 msgid "Save"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:5
-#: .\templates\wagtailsearch\editorspicks\edit.html:20
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:6
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:20
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:6
 msgid "Delete"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:9
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:9
 msgid "Are you sure you want to delete all editors picks for this search term?"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:12
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:12
 msgid "Yes, delete"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#: templates/wagtailsearch/editorspicks/edit.html:3
 #, python-format
 msgid "Editing %(query)s"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:5
 msgid "Editing"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\index.html:3
+#: templates/wagtailsearch/editorspicks/index.html:3
 msgid "Search Terms"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\index.html:17
+#: templates/wagtailsearch/editorspicks/index.html:17
 msgid "Editor's search picks"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\index.html:18
+#: templates/wagtailsearch/editorspicks/index.html:18
 msgid "Add new editor's pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:8
+#: templates/wagtailsearch/editorspicks/list.html:8
 msgid "Search term(s)"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:9
-msgid "Editors picks"
-msgstr ""
-
-#: .\templates\wagtailsearch\editorspicks\list.html:10
-#: .\templates\wagtailsearch\queries\chooser\results.html:9
+#: templates/wagtailsearch/editorspicks/list.html:10
+#: templates/wagtailsearch/queries/chooser/results.html:8
 msgid "Views (past week)"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:17
+#: templates/wagtailsearch/editorspicks/list.html:17
 msgid "Edit this pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:23
+#: templates/wagtailsearch/editorspicks/list.html:23
 msgid "None"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:5
+#: templates/wagtailsearch/editorspicks/results.html:5
 #, python-format
 msgid ""
 "\n"
@@ -131,62 +136,70 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:18
+#: templates/wagtailsearch/editorspicks/results.html:18
 #, python-format
 msgid "Sorry, no editor's picks match \"<em>%(query_string)s</em>\""
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:21
+#: templates/wagtailsearch/editorspicks/results.html:21
 #, python-format
 msgid ""
-"No editor's picks have been created. Why not <a href=\"%"
-"(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
+"No editor's picks have been created. Why not <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:4
 msgid "Move up"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:5
 msgid "Move down"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:10
 msgid "Editors pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html:14
 msgid "Add recommended page"
 msgstr ""
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+#: templates/wagtailsearch/queries/chooser/chooser.html:2
 msgid "Popular search terms"
 msgstr ""
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+#: templates/wagtailsearch/queries/chooser/chooser.html:11
 msgid "Search"
 msgstr ""
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:8
+#: templates/wagtailsearch/queries/chooser/results.html:7
 msgid "Terms"
 msgstr ""
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:23
+#: templates/wagtailsearch/queries/chooser/results.html:22
 msgid "No results found"
 msgstr ""
 
-#: .\views\editorspicks.py:41
+#: views/editorspicks.py:47
 msgid "Search editor's picks"
 msgstr ""
 
-#: .\views\editorspicks.py:75
+#: views/editorspicks.py:83
 msgid "Editor's picks for '{0}' created."
 msgstr ""
 
-#: .\views\editorspicks.py:103
+#: views/editorspicks.py:89
+msgid "Recommendations have not been created due to errors"
+msgstr ""
+
+#: views/editorspicks.py:117
 msgid "Editor's picks for '{0}' updated."
 msgstr ""
 
-#: .\views\editorspicks.py:122
+#: views/editorspicks.py:123
+msgid "Recommendations have not been saved due to errors"
+msgstr ""
+
+#: views/editorspicks.py:142
 msgid "Editor's picks deleted."
 msgstr ""
diff --git a/wagtail/wagtailsearch/locale/es/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/es/LC_MESSAGES/django.po
index 49d8c73ddc..41e8b9bb82 100644
--- a/wagtail/wagtailsearch/locale/es/LC_MESSAGES/django.po
+++ b/wagtail/wagtailsearch/locale/es/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # fooflare <amos.oviedo@gmail.com>, 2014
 # fooflare <amos.oviedo@gmail.com>, 2014
@@ -9,114 +9,144 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"POT-Creation-Date: 2014-07-11 10:54+0000\n"
 "PO-Revision-Date: 2014-03-23 10:17+0000\n"
 "Last-Translator: fooflare <amos.oviedo@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/wagtail/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/wagtail/language/"
+"es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\forms.py:8
+#: forms.py:9
 msgid "Search term(s)/phrase"
 msgstr "Término(s)/frase de búsqueda"
 
-#: .\forms.py:9
+#: forms.py:10
 msgid ""
 "Enter the full search string to match. An \n"
 "        exact match is required for your Editors Picks to be \n"
 "        displayed, wildcards are NOT allowed."
-msgstr "Introduce la cadena completa de búsqueda a encontrar. Es \n        necesaria una coincidencia exacta para que tus Selecciones del Editor sean \n        mostradas, los comodines NO están permitidos."
+msgstr ""
+"Introduce la cadena completa de búsqueda a encontrar. Es \n"
+"        necesaria una coincidencia exacta para que tus Selecciones del "
+"Editor sean \n"
+"        mostradas, los comodines NO están permitidos."
 
-#: .\templates\wagtailsearch\editorspicks\add.html:3
-#: .\templates\wagtailsearch\editorspicks\add.html:5
+#: forms.py:36
+msgid "Please specify at least one recommendation for this search term."
+msgstr ""
+
+#: wagtail_hooks.py:22 templates/wagtailsearch/editorspicks/list.html:9
+msgid "Editors picks"
+msgstr "Selecciones del editor"
+
+#: templates/wagtailsearch/editorspicks/add.html:3
+#: templates/wagtailsearch/editorspicks/add.html:5
 msgid "Add editor's pick"
 msgstr "Añadir selección del editor"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:9
+#: templates/wagtailsearch/editorspicks/add.html:9
 msgid ""
 "\n"
-"        <p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like \"<em>giving</em>\".</p>\n"
+"        <p>Editors picks are a means of recommending specific pages that "
+"might not organically come high up in search results. E.g recommending your "
+"primary donation page to a user searching with a less common term like "
+"\"<em>giving</em>\".</p>\n"
+"        "
+msgstr ""
+"\n"
+"         <p>Las Selecciones del editor son una manera de recomendar las "
+"páginas específicas que podrían no aparecer por sí solas en lo alto de los "
+"resultados de búsqueda. P. ej., la recomendación de tu página principal de "
+"donaciones a un usuario que busque con un término menos común como "
+"\"<em>dando</em>\".</p>\n"
 "        "
-msgstr "\n         <p>Las Selecciones del editor son una manera de recomendar las páginas específicas que podrían no aparecer por sí solas en lo alto de los resultados de búsqueda. P. ej., la recomendación de tu página principal de donaciones a un usuario que busque con un término menos común como \"<em>dando</em>\".</p>\n        "
 
-#: .\templates\wagtailsearch\editorspicks\add.html:12
+#: templates/wagtailsearch/editorspicks/add.html:12
 msgid ""
 "\n"
-"        <p>The \"Search term(s)/phrase\" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>\n"
+"        <p>The \"Search term(s)/phrase\" field below must contain the full "
+"and exact search for which you wish to provide recommended results, "
+"<em>including</em> any misspellings/user error. To help, you can choose from "
+"search terms that have been popular with users of your site.</p>\n"
+"        "
+msgstr ""
+"\n"
+"        <p>El campo de \"término(s)/frase de Búsqueda\" debe contener la "
+"búsqueda completa y exacta por la que deseas que se proporcionen los "
+"resultados recomendados, <em>incluyendo</em> cualquier error de de "
+"ortografía/usuario. Para ayudar, puedes elegir entre los términos de "
+"búsqueda que han sido populares entre los usuarios de tu sitio.</p>\n"
 "        "
-msgstr "\n        <p>El campo de \"término(s)/frase de Búsqueda\" debe contener la búsqueda completa y exacta por la que deseas que se proporcionen los resultados recomendados, <em>incluyendo</em> cualquier error de de ortografía/usuario. Para ayudar, puedes elegir entre los términos de búsqueda que han sido populares entre los usuarios de tu sitio.</p>\n        "
 
-#: .\templates\wagtailsearch\editorspicks\add.html:25
-#: .\templates\wagtailsearch\editorspicks\edit.html:19
+#: templates/wagtailsearch/editorspicks/add.html:25
+#: templates/wagtailsearch/editorspicks/edit.html:19
 msgid "Save"
 msgstr "Guardar"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr "Eliminar %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:5
-#: .\templates\wagtailsearch\editorspicks\edit.html:20
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:6
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:20
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:6
 msgid "Delete"
 msgstr "Eliminar"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:9
-msgid ""
-"Are you sure you want to delete all editors picks for this search term?"
-msgstr "¿Seguro que quieres eliminar todas las selecciones del editor para este término de búsqueda?"
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:9
+msgid "Are you sure you want to delete all editors picks for this search term?"
+msgstr ""
+"¿Seguro que quieres eliminar todas las selecciones del editor para este "
+"término de búsqueda?"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:12
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:12
 msgid "Yes, delete"
 msgstr "Sí, eliminar"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#: templates/wagtailsearch/editorspicks/edit.html:3
 #, python-format
 msgid "Editing %(query)s"
 msgstr "Editando %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:5
 msgid "Editing"
 msgstr "Editando"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:3
+#: templates/wagtailsearch/editorspicks/index.html:3
 msgid "Search Terms"
 msgstr "Términos de búsqueda"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:17
+#: templates/wagtailsearch/editorspicks/index.html:17
 msgid "Editor's search picks"
 msgstr "Buscar selecciones del editor"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:18
+#: templates/wagtailsearch/editorspicks/index.html:18
 msgid "Add new editor's pick"
 msgstr "Añadir nueva selección del editor"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:8
+#: templates/wagtailsearch/editorspicks/list.html:8
 msgid "Search term(s)"
 msgstr "Término(s) de búsqueda"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:9
-msgid "Editors picks"
-msgstr "Selecciones del editor"
-
-#: .\templates\wagtailsearch\editorspicks\list.html:10
-#: .\templates\wagtailsearch\queries\chooser\results.html:9
+#: templates/wagtailsearch/editorspicks/list.html:10
+#: templates/wagtailsearch/queries/chooser/results.html:8
 msgid "Views (past week)"
 msgstr "Vistas (semana pasada)"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:17
+#: templates/wagtailsearch/editorspicks/list.html:17
 msgid "Edit this pick"
 msgstr "Editar esta selección"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:23
+#: templates/wagtailsearch/editorspicks/list.html:23
 msgid "None"
 msgstr "Ninguna"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:5
+#: templates/wagtailsearch/editorspicks/results.html:5
 #, python-format
 msgid ""
 "\n"
@@ -126,65 +156,83 @@ msgid_plural ""
 "\n"
 "            There are %(counter)s matches\n"
 "        "
-msgstr[0] "\n            Hay una coincidencia\n        "
-msgstr[1] "\n            Hay %(counter)s coincidencias\n        "
+msgstr[0] ""
+"\n"
+"            Hay una coincidencia\n"
+"        "
+msgstr[1] ""
+"\n"
+"            Hay %(counter)s coincidencias\n"
+"        "
 
-#: .\templates\wagtailsearch\editorspicks\results.html:18
+#: templates/wagtailsearch/editorspicks/results.html:18
 #, python-format
 msgid "Sorry, no editor's picks match \"<em>%(query_string)s</em>\""
-msgstr "Lo sentimos, no hay coincidencias en las selecciones del editor \"<em>%(query_string)s</em>\""
+msgstr ""
+"Lo sentimos, no hay coincidencias en las selecciones del editor \"<em>"
+"%(query_string)s</em>\""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:21
+#: templates/wagtailsearch/editorspicks/results.html:21
 #, python-format
 msgid ""
-"No editor's picks have been created. Why not <a "
-"href=\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
-msgstr "Ninguna selección del editor ha sido creada. ¿Por qué no <a href=\"%(wagtailsearch_editorspicks_add_url)s\">añadir una</a>?"
+"No editor's picks have been created. Why not <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
+msgstr ""
+"Ninguna selección del editor ha sido creada. ¿Por qué no <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">añadir una</a>?"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:4
 msgid "Move up"
 msgstr "Subir"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:5
 msgid "Move down"
 msgstr "Bajar"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:10
 msgid "Editors pick"
 msgstr "Selección del editor"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html:14
 msgid "Add recommended page"
 msgstr "Añadir página recomendada"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+#: templates/wagtailsearch/queries/chooser/chooser.html:2
 msgid "Popular search terms"
 msgstr "Términos de búsqueda popular"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+#: templates/wagtailsearch/queries/chooser/chooser.html:11
 msgid "Search"
 msgstr "Buscar"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:8
+#: templates/wagtailsearch/queries/chooser/results.html:7
 msgid "Terms"
 msgstr "Términos"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:23
+#: templates/wagtailsearch/queries/chooser/results.html:22
 msgid "No results found"
 msgstr "No hay resultados"
 
-#: .\views\editorspicks.py:41
+#: views/editorspicks.py:47
 msgid "Search editor's picks"
 msgstr "Buscar selecciones del editor"
 
-#: .\views\editorspicks.py:75
+#: views/editorspicks.py:83
 msgid "Editor's picks for '{0}' created."
 msgstr "Selecciones del editor para '{0}' creadas."
 
-#: .\views\editorspicks.py:103
+#: views/editorspicks.py:89
+msgid "Recommendations have not been created due to errors"
+msgstr ""
+
+#: views/editorspicks.py:117
 msgid "Editor's picks for '{0}' updated."
 msgstr "Selecciones del editor para '{0}' actualizadas."
 
-#: .\views\editorspicks.py:122
+#: views/editorspicks.py:123
+msgid "Recommendations have not been saved due to errors"
+msgstr ""
+
+#: views/editorspicks.py:142
 msgid "Editor's picks deleted."
 msgstr "Selecciones del editor para '{0}' eliminadas."
diff --git a/wagtail/wagtailsearch/locale/eu/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/eu/LC_MESSAGES/django.po
index bb281f3136..9ae3ba143b 100644
--- a/wagtail/wagtailsearch/locale/eu/LC_MESSAGES/django.po
+++ b/wagtail/wagtailsearch/locale/eu/LC_MESSAGES/django.po
@@ -1,120 +1,130 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"POT-Creation-Date: 2014-07-11 10:54+0000\n"
 "PO-Revision-Date: 2014-03-14 21:12+0000\n"
 "Last-Translator: serafeim <serafeim@torchbox.com>\n"
-"Language-Team: Basque (http://www.transifex.com/projects/p/wagtail/language/eu/)\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/wagtail/language/"
+"eu/)\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\forms.py:8
+#: forms.py:9
 msgid "Search term(s)/phrase"
 msgstr ""
 
-#: .\forms.py:9
+#: forms.py:10
 msgid ""
 "Enter the full search string to match. An \n"
 "        exact match is required for your Editors Picks to be \n"
 "        displayed, wildcards are NOT allowed."
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:3
-#: .\templates\wagtailsearch\editorspicks\add.html:5
+#: forms.py:36
+msgid "Please specify at least one recommendation for this search term."
+msgstr ""
+
+#: wagtail_hooks.py:22 templates/wagtailsearch/editorspicks/list.html:9
+msgid "Editors picks"
+msgstr ""
+
+#: templates/wagtailsearch/editorspicks/add.html:3
+#: templates/wagtailsearch/editorspicks/add.html:5
 msgid "Add editor's pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:9
+#: templates/wagtailsearch/editorspicks/add.html:9
 msgid ""
 "\n"
-"        <p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like \"<em>giving</em>\".</p>\n"
+"        <p>Editors picks are a means of recommending specific pages that "
+"might not organically come high up in search results. E.g recommending your "
+"primary donation page to a user searching with a less common term like "
+"\"<em>giving</em>\".</p>\n"
 "        "
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:12
+#: templates/wagtailsearch/editorspicks/add.html:12
 msgid ""
 "\n"
-"        <p>The \"Search term(s)/phrase\" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>\n"
+"        <p>The \"Search term(s)/phrase\" field below must contain the full "
+"and exact search for which you wish to provide recommended results, "
+"<em>including</em> any misspellings/user error. To help, you can choose from "
+"search terms that have been popular with users of your site.</p>\n"
 "        "
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:25
-#: .\templates\wagtailsearch\editorspicks\edit.html:19
+#: templates/wagtailsearch/editorspicks/add.html:25
+#: templates/wagtailsearch/editorspicks/edit.html:19
 msgid "Save"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:5
-#: .\templates\wagtailsearch\editorspicks\edit.html:20
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:6
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:20
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:6
 msgid "Delete"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:9
-msgid ""
-"Are you sure you want to delete all editors picks for this search term?"
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:9
+msgid "Are you sure you want to delete all editors picks for this search term?"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:12
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:12
 msgid "Yes, delete"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#: templates/wagtailsearch/editorspicks/edit.html:3
 #, python-format
 msgid "Editing %(query)s"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:5
 msgid "Editing"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\index.html:3
+#: templates/wagtailsearch/editorspicks/index.html:3
 msgid "Search Terms"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\index.html:17
+#: templates/wagtailsearch/editorspicks/index.html:17
 msgid "Editor's search picks"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\index.html:18
+#: templates/wagtailsearch/editorspicks/index.html:18
 msgid "Add new editor's pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:8
+#: templates/wagtailsearch/editorspicks/list.html:8
 msgid "Search term(s)"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:9
-msgid "Editors picks"
-msgstr ""
-
-#: .\templates\wagtailsearch\editorspicks\list.html:10
-#: .\templates\wagtailsearch\queries\chooser\results.html:9
+#: templates/wagtailsearch/editorspicks/list.html:10
+#: templates/wagtailsearch/queries/chooser/results.html:8
 msgid "Views (past week)"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:17
+#: templates/wagtailsearch/editorspicks/list.html:17
 msgid "Edit this pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:23
+#: templates/wagtailsearch/editorspicks/list.html:23
 msgid "None"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:5
+#: templates/wagtailsearch/editorspicks/results.html:5
 #, python-format
 msgid ""
 "\n"
@@ -127,62 +137,70 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:18
+#: templates/wagtailsearch/editorspicks/results.html:18
 #, python-format
 msgid "Sorry, no editor's picks match \"<em>%(query_string)s</em>\""
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:21
+#: templates/wagtailsearch/editorspicks/results.html:21
 #, python-format
 msgid ""
-"No editor's picks have been created. Why not <a "
-"href=\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
+"No editor's picks have been created. Why not <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:4
 msgid "Move up"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:5
 msgid "Move down"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:10
 msgid "Editors pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html:14
 msgid "Add recommended page"
 msgstr ""
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+#: templates/wagtailsearch/queries/chooser/chooser.html:2
 msgid "Popular search terms"
 msgstr ""
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+#: templates/wagtailsearch/queries/chooser/chooser.html:11
 msgid "Search"
 msgstr ""
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:8
+#: templates/wagtailsearch/queries/chooser/results.html:7
 msgid "Terms"
 msgstr ""
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:23
+#: templates/wagtailsearch/queries/chooser/results.html:22
 msgid "No results found"
 msgstr ""
 
-#: .\views\editorspicks.py:41
+#: views/editorspicks.py:47
 msgid "Search editor's picks"
 msgstr ""
 
-#: .\views\editorspicks.py:75
+#: views/editorspicks.py:83
 msgid "Editor's picks for '{0}' created."
 msgstr ""
 
-#: .\views\editorspicks.py:103
+#: views/editorspicks.py:89
+msgid "Recommendations have not been created due to errors"
+msgstr ""
+
+#: views/editorspicks.py:117
 msgid "Editor's picks for '{0}' updated."
 msgstr ""
 
-#: .\views\editorspicks.py:122
+#: views/editorspicks.py:123
+msgid "Recommendations have not been saved due to errors"
+msgstr ""
+
+#: views/editorspicks.py:142
 msgid "Editor's picks deleted."
 msgstr ""
diff --git a/wagtail/wagtailsearch/locale/fr/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/fr/LC_MESSAGES/django.po
index 8b4ebf7ce2..9ef0619900 100644
--- a/wagtail/wagtailsearch/locale/fr/LC_MESSAGES/django.po
+++ b/wagtail/wagtailsearch/locale/fr/LC_MESSAGES/django.po
@@ -1,121 +1,131 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # nahuel, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"POT-Creation-Date: 2014-07-11 10:54+0000\n"
 "PO-Revision-Date: 2014-03-18 23:17+0000\n"
 "Last-Translator: nahuel\n"
-"Language-Team: French (http://www.transifex.com/projects/p/wagtail/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/wagtail/language/"
+"fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: .\forms.py:8
+#: forms.py:9
 msgid "Search term(s)/phrase"
 msgstr "Terme(s)/phrase de recherche"
 
-#: .\forms.py:9
+#: forms.py:10
 msgid ""
 "Enter the full search string to match. An \n"
 "        exact match is required for your Editors Picks to be \n"
 "        displayed, wildcards are NOT allowed."
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:3
-#: .\templates\wagtailsearch\editorspicks\add.html:5
+#: forms.py:36
+msgid "Please specify at least one recommendation for this search term."
+msgstr ""
+
+#: wagtail_hooks.py:22 templates/wagtailsearch/editorspicks/list.html:9
+msgid "Editors picks"
+msgstr ""
+
+#: templates/wagtailsearch/editorspicks/add.html:3
+#: templates/wagtailsearch/editorspicks/add.html:5
 msgid "Add editor's pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:9
+#: templates/wagtailsearch/editorspicks/add.html:9
 msgid ""
 "\n"
-"        <p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like \"<em>giving</em>\".</p>\n"
+"        <p>Editors picks are a means of recommending specific pages that "
+"might not organically come high up in search results. E.g recommending your "
+"primary donation page to a user searching with a less common term like "
+"\"<em>giving</em>\".</p>\n"
 "        "
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:12
+#: templates/wagtailsearch/editorspicks/add.html:12
 msgid ""
 "\n"
-"        <p>The \"Search term(s)/phrase\" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>\n"
+"        <p>The \"Search term(s)/phrase\" field below must contain the full "
+"and exact search for which you wish to provide recommended results, "
+"<em>including</em> any misspellings/user error. To help, you can choose from "
+"search terms that have been popular with users of your site.</p>\n"
 "        "
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:25
-#: .\templates\wagtailsearch\editorspicks\edit.html:19
+#: templates/wagtailsearch/editorspicks/add.html:25
+#: templates/wagtailsearch/editorspicks/edit.html:19
 msgid "Save"
 msgstr "Enregistrer"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr "Supprimée %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:5
-#: .\templates\wagtailsearch\editorspicks\edit.html:20
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:6
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:20
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:6
 msgid "Delete"
 msgstr "Supprimer"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:9
-msgid ""
-"Are you sure you want to delete all editors picks for this search term?"
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:9
+msgid "Are you sure you want to delete all editors picks for this search term?"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:12
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:12
 msgid "Yes, delete"
 msgstr "Oui, supprimer"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#: templates/wagtailsearch/editorspicks/edit.html:3
 #, python-format
 msgid "Editing %(query)s"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:5
 msgid "Editing"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\index.html:3
+#: templates/wagtailsearch/editorspicks/index.html:3
 msgid "Search Terms"
 msgstr "Termes de recherche"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:17
+#: templates/wagtailsearch/editorspicks/index.html:17
 msgid "Editor's search picks"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\index.html:18
+#: templates/wagtailsearch/editorspicks/index.html:18
 msgid "Add new editor's pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:8
+#: templates/wagtailsearch/editorspicks/list.html:8
 msgid "Search term(s)"
 msgstr "Terme(s) de recherche"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:9
-msgid "Editors picks"
-msgstr ""
-
-#: .\templates\wagtailsearch\editorspicks\list.html:10
-#: .\templates\wagtailsearch\queries\chooser\results.html:9
+#: templates/wagtailsearch/editorspicks/list.html:10
+#: templates/wagtailsearch/queries/chooser/results.html:8
 msgid "Views (past week)"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:17
+#: templates/wagtailsearch/editorspicks/list.html:17
 msgid "Edit this pick"
 msgstr "Éditer ce choix"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:23
+#: templates/wagtailsearch/editorspicks/list.html:23
 msgid "None"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:5
+#: templates/wagtailsearch/editorspicks/results.html:5
 #, python-format
 msgid ""
 "\n"
@@ -128,62 +138,72 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:18
+#: templates/wagtailsearch/editorspicks/results.html:18
 #, python-format
 msgid "Sorry, no editor's picks match \"<em>%(query_string)s</em>\""
-msgstr "Désolé, aucun choix de rédacteur ne correspond avec \"<em>%(query_string)s</em>\""
+msgstr ""
+"Désolé, aucun choix de rédacteur ne correspond avec \"<em>%(query_string)s</"
+"em>\""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:21
+#: templates/wagtailsearch/editorspicks/results.html:21
 #, python-format
 msgid ""
-"No editor's picks have been created. Why not <a "
-"href=\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
+"No editor's picks have been created. Why not <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:4
 msgid "Move up"
 msgstr "Monter"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:5
 msgid "Move down"
 msgstr "Descendre"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:10
 msgid "Editors pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html:14
 msgid "Add recommended page"
 msgstr ""
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+#: templates/wagtailsearch/queries/chooser/chooser.html:2
 msgid "Popular search terms"
 msgstr "Termes de recherche populaires"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+#: templates/wagtailsearch/queries/chooser/chooser.html:11
 msgid "Search"
 msgstr ""
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:8
+#: templates/wagtailsearch/queries/chooser/results.html:7
 msgid "Terms"
 msgstr "Termes"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:23
+#: templates/wagtailsearch/queries/chooser/results.html:22
 msgid "No results found"
 msgstr "Aucun résultat trouvé"
 
-#: .\views\editorspicks.py:41
+#: views/editorspicks.py:47
 msgid "Search editor's picks"
 msgstr ""
 
-#: .\views\editorspicks.py:75
+#: views/editorspicks.py:83
 msgid "Editor's picks for '{0}' created."
 msgstr ""
 
-#: .\views\editorspicks.py:103
+#: views/editorspicks.py:89
+msgid "Recommendations have not been created due to errors"
+msgstr ""
+
+#: views/editorspicks.py:117
 msgid "Editor's picks for '{0}' updated."
 msgstr ""
 
-#: .\views\editorspicks.py:122
+#: views/editorspicks.py:123
+msgid "Recommendations have not been saved due to errors"
+msgstr ""
+
+#: views/editorspicks.py:142
 msgid "Editor's picks deleted."
 msgstr ""
diff --git a/wagtail/wagtailsearch/locale/gl/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/gl/LC_MESSAGES/django.po
index b203013f47..18e32e638c 100644
--- a/wagtail/wagtailsearch/locale/gl/LC_MESSAGES/django.po
+++ b/wagtail/wagtailsearch/locale/gl/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # fooflare <amos.oviedo@gmail.com>, 2014
 # fooflare <amos.oviedo@gmail.com>, 2014
@@ -9,114 +9,144 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"POT-Creation-Date: 2014-07-11 10:54+0000\n"
 "PO-Revision-Date: 2014-03-23 10:33+0000\n"
 "Last-Translator: fooflare <amos.oviedo@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.com/projects/p/wagtail/language/gl/)\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/wagtail/"
+"language/gl/)\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\forms.py:8
+#: forms.py:9
 msgid "Search term(s)/phrase"
 msgstr "Termo(s)/frase de busca"
 
-#: .\forms.py:9
+#: forms.py:10
 msgid ""
 "Enter the full search string to match. An \n"
 "        exact match is required for your Editors Picks to be \n"
 "        displayed, wildcards are NOT allowed."
-msgstr "Introduce a cadea completa de busca a atopar. É \n        necesaria unha coincidencia exacta para que as túas Seleccións do Editor sexan \n        mostradas, os comodines NON están permitidos."
+msgstr ""
+"Introduce a cadea completa de busca a atopar. É \n"
+"        necesaria unha coincidencia exacta para que as túas Seleccións do "
+"Editor sexan \n"
+"        mostradas, os comodines NON están permitidos."
 
-#: .\templates\wagtailsearch\editorspicks\add.html:3
-#: .\templates\wagtailsearch\editorspicks\add.html:5
+#: forms.py:36
+msgid "Please specify at least one recommendation for this search term."
+msgstr ""
+
+#: wagtail_hooks.py:22 templates/wagtailsearch/editorspicks/list.html:9
+msgid "Editors picks"
+msgstr "Seleccións do editor"
+
+#: templates/wagtailsearch/editorspicks/add.html:3
+#: templates/wagtailsearch/editorspicks/add.html:5
 msgid "Add editor's pick"
 msgstr "Engadir selección do editor"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:9
+#: templates/wagtailsearch/editorspicks/add.html:9
 msgid ""
 "\n"
-"        <p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like \"<em>giving</em>\".</p>\n"
+"        <p>Editors picks are a means of recommending specific pages that "
+"might not organically come high up in search results. E.g recommending your "
+"primary donation page to a user searching with a less common term like "
+"\"<em>giving</em>\".</p>\n"
+"        "
+msgstr ""
+"\n"
+"         <p>As Seleccións do editor son unha maneira de recomendar as "
+"páxinas específicas que poderían non aparecer por sí soas no alto dos "
+"resultados de búsqueda. P. ex., a recomendación da túa páxina principal de "
+"donacións a un usuario que procure con un termo menos común como "
+"\"<em>dando</em>\".</p>\n"
 "        "
-msgstr "\n         <p>As Seleccións do editor son unha maneira de recomendar as páxinas específicas que poderían non aparecer por sí soas no alto dos resultados de búsqueda. P. ex., a recomendación da túa páxina principal de donacións a un usuario que procure con un termo menos común como \"<em>dando</em>\".</p>\n        "
 
-#: .\templates\wagtailsearch\editorspicks\add.html:12
+#: templates/wagtailsearch/editorspicks/add.html:12
 msgid ""
 "\n"
-"        <p>The \"Search term(s)/phrase\" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>\n"
+"        <p>The \"Search term(s)/phrase\" field below must contain the full "
+"and exact search for which you wish to provide recommended results, "
+"<em>including</em> any misspellings/user error. To help, you can choose from "
+"search terms that have been popular with users of your site.</p>\n"
+"        "
+msgstr ""
+"\n"
+"        <p>O campo de \"termo(s)/frase de Busca\" debe conter a busca "
+"completa e exacta pola que desexas que se proporcionen os resultados "
+"recomendados, <em>incluíndo</em> calquera erro de de ortografía/usuario. "
+"Para axudar, podes elixir entre os termos de busca que foron populares entre "
+"os usuarios do teu sitio.</p>\n"
 "        "
-msgstr "\n        <p>O campo de \"termo(s)/frase de Busca\" debe conter a busca completa e exacta pola que desexas que se proporcionen os resultados recomendados, <em>incluíndo</em> calquera erro de de ortografía/usuario. Para axudar, podes elixir entre os termos de busca que foron populares entre os usuarios do teu sitio.</p>\n        "
 
-#: .\templates\wagtailsearch\editorspicks\add.html:25
-#: .\templates\wagtailsearch\editorspicks\edit.html:19
+#: templates/wagtailsearch/editorspicks/add.html:25
+#: templates/wagtailsearch/editorspicks/edit.html:19
 msgid "Save"
 msgstr "Gardar"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr "Eliminar %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:5
-#: .\templates\wagtailsearch\editorspicks\edit.html:20
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:6
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:20
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:6
 msgid "Delete"
 msgstr "Eliminar"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:9
-msgid ""
-"Are you sure you want to delete all editors picks for this search term?"
-msgstr "¿Seguro que queres eliminar todas as seleccións do editor para este termo de busca?"
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:9
+msgid "Are you sure you want to delete all editors picks for this search term?"
+msgstr ""
+"¿Seguro que queres eliminar todas as seleccións do editor para este termo de "
+"busca?"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:12
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:12
 msgid "Yes, delete"
 msgstr "Sí, eliminar"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#: templates/wagtailsearch/editorspicks/edit.html:3
 #, python-format
 msgid "Editing %(query)s"
 msgstr "Editando %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:5
 msgid "Editing"
 msgstr "Editando"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:3
+#: templates/wagtailsearch/editorspicks/index.html:3
 msgid "Search Terms"
 msgstr "Termos de busca"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:17
+#: templates/wagtailsearch/editorspicks/index.html:17
 msgid "Editor's search picks"
 msgstr "Buscar seleccións do editor"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:18
+#: templates/wagtailsearch/editorspicks/index.html:18
 msgid "Add new editor's pick"
 msgstr "Engadir nova selección do editor"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:8
+#: templates/wagtailsearch/editorspicks/list.html:8
 msgid "Search term(s)"
 msgstr "Termos(s) de busca"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:9
-msgid "Editors picks"
-msgstr "Seleccións do editor"
-
-#: .\templates\wagtailsearch\editorspicks\list.html:10
-#: .\templates\wagtailsearch\queries\chooser\results.html:9
+#: templates/wagtailsearch/editorspicks/list.html:10
+#: templates/wagtailsearch/queries/chooser/results.html:8
 msgid "Views (past week)"
 msgstr "Vistas (semana pasada)"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:17
+#: templates/wagtailsearch/editorspicks/list.html:17
 msgid "Edit this pick"
 msgstr "Editar esta selección"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:23
+#: templates/wagtailsearch/editorspicks/list.html:23
 msgid "None"
 msgstr "Ningunha"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:5
+#: templates/wagtailsearch/editorspicks/results.html:5
 #, python-format
 msgid ""
 "\n"
@@ -126,65 +156,82 @@ msgid_plural ""
 "\n"
 "            There are %(counter)s matches\n"
 "        "
-msgstr[0] "\n            Hai unha coincidencia\n        "
-msgstr[1] "\n            Hai %(counter)s coincidencias\n        "
+msgstr[0] ""
+"\n"
+"            Hai unha coincidencia\n"
+"        "
+msgstr[1] ""
+"\n"
+"            Hai %(counter)s coincidencias\n"
+"        "
 
-#: .\templates\wagtailsearch\editorspicks\results.html:18
+#: templates/wagtailsearch/editorspicks/results.html:18
 #, python-format
 msgid "Sorry, no editor's picks match \"<em>%(query_string)s</em>\""
-msgstr "Sentímolo, ningunha selección do editor contén \"<em>%(query_string)s</em>\""
+msgstr ""
+"Sentímolo, ningunha selección do editor contén \"<em>%(query_string)s</em>\""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:21
+#: templates/wagtailsearch/editorspicks/results.html:21
 #, python-format
 msgid ""
-"No editor's picks have been created. Why not <a "
-"href=\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
-msgstr "Ningunha selección do editor foi creada. ¿Por qué non <a href=\"%(wagtailsearch_editorspicks_add_url)s\">engadir unha</a>?"
+"No editor's picks have been created. Why not <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
+msgstr ""
+"Ningunha selección do editor foi creada. ¿Por qué non <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">engadir unha</a>?"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:4
 msgid "Move up"
 msgstr "Subir"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:5
 msgid "Move down"
 msgstr "Baixar"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:10
 msgid "Editors pick"
 msgstr "Selección do editor"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html:14
 msgid "Add recommended page"
 msgstr "Engadir páxina recomendada"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+#: templates/wagtailsearch/queries/chooser/chooser.html:2
 msgid "Popular search terms"
 msgstr "Termos de busca popular"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+#: templates/wagtailsearch/queries/chooser/chooser.html:11
 msgid "Search"
 msgstr "Buscar"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:8
+#: templates/wagtailsearch/queries/chooser/results.html:7
 msgid "Terms"
 msgstr "Termos"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:23
+#: templates/wagtailsearch/queries/chooser/results.html:22
 msgid "No results found"
 msgstr "Non hai resultados"
 
-#: .\views\editorspicks.py:41
+#: views/editorspicks.py:47
 msgid "Search editor's picks"
 msgstr "Buscar seleccións do editor"
 
-#: .\views\editorspicks.py:75
+#: views/editorspicks.py:83
 msgid "Editor's picks for '{0}' created."
 msgstr "Seleccións do editor para '{0}' creadas."
 
-#: .\views\editorspicks.py:103
+#: views/editorspicks.py:89
+msgid "Recommendations have not been created due to errors"
+msgstr ""
+
+#: views/editorspicks.py:117
 msgid "Editor's picks for '{0}' updated."
 msgstr "Seleccións do editor para '{0}' actualizadas."
 
-#: .\views\editorspicks.py:122
+#: views/editorspicks.py:123
+msgid "Recommendations have not been saved due to errors"
+msgstr ""
+
+#: views/editorspicks.py:142
 msgid "Editor's picks deleted."
 msgstr "Seleccións do editor para '{0}' eliminadas."
diff --git a/wagtail/wagtailsearch/locale/mn/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/mn/LC_MESSAGES/django.po
index f356bfe87f..0281e67ce1 100644
--- a/wagtail/wagtailsearch/locale/mn/LC_MESSAGES/django.po
+++ b/wagtail/wagtailsearch/locale/mn/LC_MESSAGES/django.po
@@ -1,121 +1,131 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # delgermurun <info@delgermurun.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"POT-Creation-Date: 2014-07-11 10:54+0000\n"
 "PO-Revision-Date: 2014-03-14 21:12+0000\n"
 "Last-Translator: serafeim <serafeim@torchbox.com>\n"
-"Language-Team: Mongolian (http://www.transifex.com/projects/p/wagtail/language/mn/)\n"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/wagtail/"
+"language/mn/)\n"
+"Language: mn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\forms.py:8
+#: forms.py:9
 msgid "Search term(s)/phrase"
 msgstr ""
 
-#: .\forms.py:9
+#: forms.py:10
 msgid ""
 "Enter the full search string to match. An \n"
 "        exact match is required for your Editors Picks to be \n"
 "        displayed, wildcards are NOT allowed."
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:3
-#: .\templates\wagtailsearch\editorspicks\add.html:5
+#: forms.py:36
+msgid "Please specify at least one recommendation for this search term."
+msgstr ""
+
+#: wagtail_hooks.py:22 templates/wagtailsearch/editorspicks/list.html:9
+msgid "Editors picks"
+msgstr ""
+
+#: templates/wagtailsearch/editorspicks/add.html:3
+#: templates/wagtailsearch/editorspicks/add.html:5
 msgid "Add editor's pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:9
+#: templates/wagtailsearch/editorspicks/add.html:9
 msgid ""
 "\n"
-"        <p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like \"<em>giving</em>\".</p>\n"
+"        <p>Editors picks are a means of recommending specific pages that "
+"might not organically come high up in search results. E.g recommending your "
+"primary donation page to a user searching with a less common term like "
+"\"<em>giving</em>\".</p>\n"
 "        "
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:12
+#: templates/wagtailsearch/editorspicks/add.html:12
 msgid ""
 "\n"
-"        <p>The \"Search term(s)/phrase\" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>\n"
+"        <p>The \"Search term(s)/phrase\" field below must contain the full "
+"and exact search for which you wish to provide recommended results, "
+"<em>including</em> any misspellings/user error. To help, you can choose from "
+"search terms that have been popular with users of your site.</p>\n"
 "        "
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\add.html:25
-#: .\templates\wagtailsearch\editorspicks\edit.html:19
+#: templates/wagtailsearch/editorspicks/add.html:25
+#: templates/wagtailsearch/editorspicks/edit.html:19
 msgid "Save"
 msgstr "Хадгалах"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:5
-#: .\templates\wagtailsearch\editorspicks\edit.html:20
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:6
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:20
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:6
 msgid "Delete"
 msgstr "Устгах"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:9
-msgid ""
-"Are you sure you want to delete all editors picks for this search term?"
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:9
+msgid "Are you sure you want to delete all editors picks for this search term?"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:12
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:12
 msgid "Yes, delete"
 msgstr "Тийм, устга"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#: templates/wagtailsearch/editorspicks/edit.html:3
 #, python-format
 msgid "Editing %(query)s"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:5
 msgid "Editing"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\index.html:3
+#: templates/wagtailsearch/editorspicks/index.html:3
 msgid "Search Terms"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\index.html:17
+#: templates/wagtailsearch/editorspicks/index.html:17
 msgid "Editor's search picks"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\index.html:18
+#: templates/wagtailsearch/editorspicks/index.html:18
 msgid "Add new editor's pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:8
+#: templates/wagtailsearch/editorspicks/list.html:8
 msgid "Search term(s)"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:9
-msgid "Editors picks"
-msgstr ""
-
-#: .\templates\wagtailsearch\editorspicks\list.html:10
-#: .\templates\wagtailsearch\queries\chooser\results.html:9
+#: templates/wagtailsearch/editorspicks/list.html:10
+#: templates/wagtailsearch/queries/chooser/results.html:8
 msgid "Views (past week)"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:17
+#: templates/wagtailsearch/editorspicks/list.html:17
 msgid "Edit this pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\list.html:23
+#: templates/wagtailsearch/editorspicks/list.html:23
 msgid "None"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:5
+#: templates/wagtailsearch/editorspicks/results.html:5
 #, python-format
 msgid ""
 "\n"
@@ -128,62 +138,70 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:18
+#: templates/wagtailsearch/editorspicks/results.html:18
 #, python-format
 msgid "Sorry, no editor's picks match \"<em>%(query_string)s</em>\""
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:21
+#: templates/wagtailsearch/editorspicks/results.html:21
 #, python-format
 msgid ""
-"No editor's picks have been created. Why not <a "
-"href=\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
+"No editor's picks have been created. Why not <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:4
 msgid "Move up"
 msgstr "Дээшээ"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:5
 msgid "Move down"
 msgstr "Доошоо"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:10
 msgid "Editors pick"
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html:14
 msgid "Add recommended page"
 msgstr ""
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+#: templates/wagtailsearch/queries/chooser/chooser.html:2
 msgid "Popular search terms"
 msgstr ""
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+#: templates/wagtailsearch/queries/chooser/chooser.html:11
 msgid "Search"
 msgstr "Хайх"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:8
+#: templates/wagtailsearch/queries/chooser/results.html:7
 msgid "Terms"
 msgstr ""
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:23
+#: templates/wagtailsearch/queries/chooser/results.html:22
 msgid "No results found"
 msgstr ""
 
-#: .\views\editorspicks.py:41
+#: views/editorspicks.py:47
 msgid "Search editor's picks"
 msgstr ""
 
-#: .\views\editorspicks.py:75
+#: views/editorspicks.py:83
 msgid "Editor's picks for '{0}' created."
 msgstr ""
 
-#: .\views\editorspicks.py:103
+#: views/editorspicks.py:89
+msgid "Recommendations have not been created due to errors"
+msgstr ""
+
+#: views/editorspicks.py:117
 msgid "Editor's picks for '{0}' updated."
 msgstr ""
 
-#: .\views\editorspicks.py:122
+#: views/editorspicks.py:123
+msgid "Recommendations have not been saved due to errors"
+msgstr ""
+
+#: views/editorspicks.py:142
 msgid "Editor's picks deleted."
 msgstr ""
diff --git a/wagtail/wagtailsearch/locale/pl/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/pl/LC_MESSAGES/django.po
index d84c001d29..aca1220598 100644
--- a/wagtail/wagtailsearch/locale/pl/LC_MESSAGES/django.po
+++ b/wagtail/wagtailsearch/locale/pl/LC_MESSAGES/django.po
@@ -1,121 +1,150 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # utek <mail@utek.pl>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"POT-Creation-Date: 2014-07-11 10:54+0000\n"
 "PO-Revision-Date: 2014-03-14 22:16+0000\n"
 "Last-Translator: utek <mail@utek.pl>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/wagtail/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/wagtail/language/"
+"pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
-#: .\forms.py:8
+#: forms.py:9
 msgid "Search term(s)/phrase"
 msgstr "Frazy wyszukiwania"
 
-#: .\forms.py:9
+#: forms.py:10
 msgid ""
 "Enter the full search string to match. An \n"
 "        exact match is required for your Editors Picks to be \n"
 "        displayed, wildcards are NOT allowed."
-msgstr "Wprowadź pełną frazę wyszukania do porównania.\n        Dokładne porównanie jest wymagane żeby twoje \n        wybory redakcji były wyświetlone, symbol \n        wieloznaczności jest niedozwolony."
+msgstr ""
+"Wprowadź pełną frazę wyszukania do porównania.\n"
+"        Dokładne porównanie jest wymagane żeby twoje \n"
+"        wybory redakcji były wyświetlone, symbol \n"
+"        wieloznaczności jest niedozwolony."
 
-#: .\templates\wagtailsearch\editorspicks\add.html:3
-#: .\templates\wagtailsearch\editorspicks\add.html:5
+#: forms.py:36
+msgid "Please specify at least one recommendation for this search term."
+msgstr ""
+
+#: wagtail_hooks.py:22 templates/wagtailsearch/editorspicks/list.html:9
+msgid "Editors picks"
+msgstr "Wybór redakcji"
+
+#: templates/wagtailsearch/editorspicks/add.html:3
+#: templates/wagtailsearch/editorspicks/add.html:5
 msgid "Add editor's pick"
 msgstr "Dodaj wybór redakcji"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:9
+#: templates/wagtailsearch/editorspicks/add.html:9
 msgid ""
 "\n"
-"        <p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like \"<em>giving</em>\".</p>\n"
+"        <p>Editors picks are a means of recommending specific pages that "
+"might not organically come high up in search results. E.g recommending your "
+"primary donation page to a user searching with a less common term like "
+"\"<em>giving</em>\".</p>\n"
+"        "
+msgstr ""
+"\n"
+"        <p>Wybór redakcji służy do polecania stron, które normalnie "
+"niekoniecznie pojawiają sie wysoko w wynikach wyszukiwania. Np. polecanie "
+"głównej strony z darowiznami użytkownikom szukającym mniej pasujących "
+"wyrażeń jak np. \"<em>oferować</em>\".</p>\n"
 "        "
-msgstr "\n        <p>Wybór redakcji służy do polecania stron, które normalnie niekoniecznie pojawiają sie wysoko w wynikach wyszukiwania. Np. polecanie głównej strony z darowiznami użytkownikom szukającym mniej pasujących wyrażeń jak np. \"<em>oferować</em>\".</p>\n        "
 
-#: .\templates\wagtailsearch\editorspicks\add.html:12
+#: templates/wagtailsearch/editorspicks/add.html:12
 msgid ""
 "\n"
-"        <p>The \"Search term(s)/phrase\" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>\n"
+"        <p>The \"Search term(s)/phrase\" field below must contain the full "
+"and exact search for which you wish to provide recommended results, "
+"<em>including</em> any misspellings/user error. To help, you can choose from "
+"search terms that have been popular with users of your site.</p>\n"
+"        "
+msgstr ""
+"\n"
+"        <p>Pole \"Frazy wyszukiwania\" musi zawierać pełne i dokładne "
+"wyszukanie dla którego chcesz wyświetlić polecanie wyniki, <em>razem z</em> "
+"wszystkimi literówkami/błędami użytkownika. W celu ułatwienia możesz wybrać "
+"z fraz wyszukiwania popularnych wśród użytkowników Twojej strony</p>\n"
 "        "
-msgstr "\n        <p>Pole \"Frazy wyszukiwania\" musi zawierać pełne i dokładne wyszukanie dla którego chcesz wyświetlić polecanie wyniki, <em>razem z</em> wszystkimi literówkami/błędami użytkownika. W celu ułatwienia możesz wybrać z fraz wyszukiwania popularnych wśród użytkowników Twojej strony</p>\n        "
 
-#: .\templates\wagtailsearch\editorspicks\add.html:25
-#: .\templates\wagtailsearch\editorspicks\edit.html:19
+#: templates/wagtailsearch/editorspicks/add.html:25
+#: templates/wagtailsearch/editorspicks/edit.html:19
 msgid "Save"
 msgstr "Zapisz"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr "Usuń %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:5
-#: .\templates\wagtailsearch\editorspicks\edit.html:20
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:6
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:20
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:6
 msgid "Delete"
 msgstr "Usuń"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:9
-msgid ""
-"Are you sure you want to delete all editors picks for this search term?"
-msgstr "Czy na pewno chcesz usunąć wszystkie wybory redakcji dla tych fraz wyszukiwania?"
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:9
+msgid "Are you sure you want to delete all editors picks for this search term?"
+msgstr ""
+"Czy na pewno chcesz usunąć wszystkie wybory redakcji dla tych fraz "
+"wyszukiwania?"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:12
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:12
 msgid "Yes, delete"
 msgstr "Tak, usuń"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#: templates/wagtailsearch/editorspicks/edit.html:3
 #, python-format
 msgid "Editing %(query)s"
 msgstr "Edycja %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:5
 msgid "Editing"
 msgstr "Edytujesz"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:3
+#: templates/wagtailsearch/editorspicks/index.html:3
 msgid "Search Terms"
 msgstr "Frazy wyszukiwania"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:17
+#: templates/wagtailsearch/editorspicks/index.html:17
 msgid "Editor's search picks"
 msgstr "Wybory redakcji dla wyszukiwania"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:18
+#: templates/wagtailsearch/editorspicks/index.html:18
 msgid "Add new editor's pick"
 msgstr "Dodaj nowy wybór redakcji"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:8
+#: templates/wagtailsearch/editorspicks/list.html:8
 msgid "Search term(s)"
 msgstr "Frazy wyszukiwania"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:9
-msgid "Editors picks"
-msgstr "Wybór redakcji"
-
-#: .\templates\wagtailsearch\editorspicks\list.html:10
-#: .\templates\wagtailsearch\queries\chooser\results.html:9
+#: templates/wagtailsearch/editorspicks/list.html:10
+#: templates/wagtailsearch/queries/chooser/results.html:8
 msgid "Views (past week)"
 msgstr "Odsłony (poprzedni tydzień)"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:17
+#: templates/wagtailsearch/editorspicks/list.html:17
 msgid "Edit this pick"
 msgstr "Edytuj ten wybór"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:23
+#: templates/wagtailsearch/editorspicks/list.html:23
 msgid "None"
 msgstr "Brak"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:5
+#: templates/wagtailsearch/editorspicks/results.html:5
 #, python-format
 msgid ""
 "\n"
@@ -125,66 +154,87 @@ msgid_plural ""
 "\n"
 "            There are %(counter)s matches\n"
 "        "
-msgstr[0] "\n            Jedno dopasowanie\n        "
-msgstr[1] "\n            Są %(counter)s dopasowania\n        "
-msgstr[2] "\n            Jest %(counter)s dopasowań\n        "
+msgstr[0] ""
+"\n"
+"            Jedno dopasowanie\n"
+"        "
+msgstr[1] ""
+"\n"
+"            Są %(counter)s dopasowania\n"
+"        "
+msgstr[2] ""
+"\n"
+"            Jest %(counter)s dopasowań\n"
+"        "
 
-#: .\templates\wagtailsearch\editorspicks\results.html:18
+#: templates/wagtailsearch/editorspicks/results.html:18
 #, python-format
 msgid "Sorry, no editor's picks match \"<em>%(query_string)s</em>\""
-msgstr "Przepraszamy, żaden wybór redakcji nie pasuje do \"<em>%(query_string)s</em>\""
+msgstr ""
+"Przepraszamy, żaden wybór redakcji nie pasuje do \"<em>%(query_string)s</em>"
+"\""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:21
+#: templates/wagtailsearch/editorspicks/results.html:21
 #, python-format
 msgid ""
-"No editor's picks have been created. Why not <a "
-"href=\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
-msgstr "Nie stworzono żadnego wyboru redakcji. Czemu nie <a href=\"%(wagtailsearch_editorspicks_add_url)s\">dodać jakiegoś</a>?"
+"No editor's picks have been created. Why not <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
+msgstr ""
+"Nie stworzono żadnego wyboru redakcji. Czemu nie <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">dodać jakiegoś</a>?"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:4
 msgid "Move up"
 msgstr "Przesuń w górę"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:5
 msgid "Move down"
 msgstr "Przesuń w dół"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:10
 msgid "Editors pick"
 msgstr "Wybór redakcji"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html:14
 msgid "Add recommended page"
 msgstr "Dodaj polecaną stronę"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+#: templates/wagtailsearch/queries/chooser/chooser.html:2
 msgid "Popular search terms"
 msgstr "Popularne wyszukiwania"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+#: templates/wagtailsearch/queries/chooser/chooser.html:11
 msgid "Search"
 msgstr "Szukaj"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:8
+#: templates/wagtailsearch/queries/chooser/results.html:7
 msgid "Terms"
 msgstr "Frazy"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:23
+#: templates/wagtailsearch/queries/chooser/results.html:22
 msgid "No results found"
 msgstr "Nie znaleziono"
 
-#: .\views\editorspicks.py:41
+#: views/editorspicks.py:47
 msgid "Search editor's picks"
 msgstr "Szukaj wyborów redakcji"
 
-#: .\views\editorspicks.py:75
+#: views/editorspicks.py:83
 msgid "Editor's picks for '{0}' created."
 msgstr "Stworzono wybór redakcji dla '{0}'"
 
-#: .\views\editorspicks.py:103
+#: views/editorspicks.py:89
+msgid "Recommendations have not been created due to errors"
+msgstr ""
+
+#: views/editorspicks.py:117
 msgid "Editor's picks for '{0}' updated."
 msgstr "Zaktualizowano wybór redakcji dla '{0}'."
 
-#: .\views\editorspicks.py:122
+#: views/editorspicks.py:123
+msgid "Recommendations have not been saved due to errors"
+msgstr ""
+
+#: views/editorspicks.py:142
 msgid "Editor's picks deleted."
 msgstr "Usunięto wybór redakcji."
diff --git a/wagtail/wagtailsearch/locale/ro/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/ro/LC_MESSAGES/django.po
index c2230798f7..4bec0c5af5 100644
--- a/wagtail/wagtailsearch/locale/ro/LC_MESSAGES/django.po
+++ b/wagtail/wagtailsearch/locale/ro/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # zerolab, 2014
 # zerolab, 2014
@@ -9,114 +9,140 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"POT-Creation-Date: 2014-07-11 10:54+0000\n"
 "PO-Revision-Date: 2014-03-18 13:21+0000\n"
 "Last-Translator: zerolab\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/wagtail/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/wagtail/"
+"language/ro/)\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
 
-#: .\forms.py:8
+#: forms.py:9
 msgid "Search term(s)/phrase"
 msgstr "Termeni/frază de căutare"
 
-#: .\forms.py:9
+#: forms.py:10
 msgid ""
 "Enter the full search string to match. An \n"
 "        exact match is required for your Editors Picks to be \n"
 "        displayed, wildcards are NOT allowed."
-msgstr "Introduceți șirul complet de căutare. \nEste nevoie de o potrivire exactă pentru a afișa selecțiile \ndvs. editoriale. Metacaractere NU sunt permise."
+msgstr ""
+"Introduceți șirul complet de căutare. \n"
+"Este nevoie de o potrivire exactă pentru a afișa selecțiile \n"
+"dvs. editoriale. Metacaractere NU sunt permise."
 
-#: .\templates\wagtailsearch\editorspicks\add.html:3
-#: .\templates\wagtailsearch\editorspicks\add.html:5
+#: forms.py:36
+msgid "Please specify at least one recommendation for this search term."
+msgstr ""
+
+#: wagtail_hooks.py:22 templates/wagtailsearch/editorspicks/list.html:9
+msgid "Editors picks"
+msgstr "Selecții editoriale"
+
+#: templates/wagtailsearch/editorspicks/add.html:3
+#: templates/wagtailsearch/editorspicks/add.html:5
 msgid "Add editor's pick"
 msgstr "Adaugă selecție editorială"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:9
+#: templates/wagtailsearch/editorspicks/add.html:9
 msgid ""
 "\n"
-"        <p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like \"<em>giving</em>\".</p>\n"
+"        <p>Editors picks are a means of recommending specific pages that "
+"might not organically come high up in search results. E.g recommending your "
+"primary donation page to a user searching with a less common term like "
+"\"<em>giving</em>\".</p>\n"
 "        "
-msgstr "\n<p>Selecțiile editoriale sunt mijloace de recomandare de pagini ce pot să nu apară la începutul rezultatelor de căutare în mod natural. De exemplu, recomandarea paginii de donații utilizatorilor care au căutat termeni mai puțin specifici ca \"<em>dare</em>\".</p>"
+msgstr ""
+"\n"
+"<p>Selecțiile editoriale sunt mijloace de recomandare de pagini ce pot să nu "
+"apară la începutul rezultatelor de căutare în mod natural. De exemplu, "
+"recomandarea paginii de donații utilizatorilor care au căutat termeni mai "
+"puțin specifici ca \"<em>dare</em>\".</p>"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:12
+#: templates/wagtailsearch/editorspicks/add.html:12
 msgid ""
 "\n"
-"        <p>The \"Search term(s)/phrase\" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>\n"
+"        <p>The \"Search term(s)/phrase\" field below must contain the full "
+"and exact search for which you wish to provide recommended results, "
+"<em>including</em> any misspellings/user error. To help, you can choose from "
+"search terms that have been popular with users of your site.</p>\n"
 "        "
-msgstr "\n<p>Câmpul \"Termeni/frază de căutare\" de mai jos trebuie să conțină șirul exact pentru care doriți să furnizați rezultate recomandate. <em>Includeți</em> greșeli ortografice și alte greșeli. Puteți să alegeți din termenii de căutare populari printre utilizatorii sitului dvs.</p>"
+msgstr ""
+"\n"
+"<p>Câmpul \"Termeni/frază de căutare\" de mai jos trebuie să conțină șirul "
+"exact pentru care doriți să furnizați rezultate recomandate. <em>Includeți</"
+"em> greșeli ortografice și alte greșeli. Puteți să alegeți din termenii de "
+"căutare populari printre utilizatorii sitului dvs.</p>"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:25
-#: .\templates\wagtailsearch\editorspicks\edit.html:19
+#: templates/wagtailsearch/editorspicks/add.html:25
+#: templates/wagtailsearch/editorspicks/edit.html:19
 msgid "Save"
 msgstr "Salvează"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr "Șterge %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:5
-#: .\templates\wagtailsearch\editorspicks\edit.html:20
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:6
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:20
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:6
 msgid "Delete"
 msgstr "Șterge"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:9
-msgid ""
-"Are you sure you want to delete all editors picks for this search term?"
-msgstr "Sigur doriți să ștergeți toate selecțiile editoriale pentru acest termen de căutare?"
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:9
+msgid "Are you sure you want to delete all editors picks for this search term?"
+msgstr ""
+"Sigur doriți să ștergeți toate selecțiile editoriale pentru acest termen de "
+"căutare?"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:12
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:12
 msgid "Yes, delete"
 msgstr "Da, șterge"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#: templates/wagtailsearch/editorspicks/edit.html:3
 #, python-format
 msgid "Editing %(query)s"
 msgstr "Editare %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:5
 msgid "Editing"
 msgstr "Editare"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:3
+#: templates/wagtailsearch/editorspicks/index.html:3
 msgid "Search Terms"
 msgstr "Termeni de căutare"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:17
+#: templates/wagtailsearch/editorspicks/index.html:17
 msgid "Editor's search picks"
 msgstr "Selecții editoriale de căutare"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:18
+#: templates/wagtailsearch/editorspicks/index.html:18
 msgid "Add new editor's pick"
 msgstr "Adaugă selecție editorială nouă"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:8
+#: templates/wagtailsearch/editorspicks/list.html:8
 msgid "Search term(s)"
 msgstr "Termen de căutare"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:9
-msgid "Editors picks"
-msgstr "Selecții editoriale"
-
-#: .\templates\wagtailsearch\editorspicks\list.html:10
-#: .\templates\wagtailsearch\queries\chooser\results.html:9
+#: templates/wagtailsearch/editorspicks/list.html:10
+#: templates/wagtailsearch/queries/chooser/results.html:8
 msgid "Views (past week)"
 msgstr "Vizualizări (ultima săptămână)"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:17
+#: templates/wagtailsearch/editorspicks/list.html:17
 msgid "Edit this pick"
 msgstr "Editează selecția"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:23
+#: templates/wagtailsearch/editorspicks/list.html:23
 msgid "None"
 msgstr "Nici una"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:5
+#: templates/wagtailsearch/editorspicks/results.html:5
 #, python-format
 msgid ""
 "\n"
@@ -126,66 +152,84 @@ msgid_plural ""
 "\n"
 "            There are %(counter)s matches\n"
 "        "
-msgstr[0] "\nExistă o potrivire"
-msgstr[1] "\nSunt %(counter)s potriviri"
-msgstr[2] "\nSunt %(counter)s potriviri"
+msgstr[0] ""
+"\n"
+"Există o potrivire"
+msgstr[1] ""
+"\n"
+"Sunt %(counter)s potriviri"
+msgstr[2] ""
+"\n"
+"Sunt %(counter)s potriviri"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:18
+#: templates/wagtailsearch/editorspicks/results.html:18
 #, python-format
 msgid "Sorry, no editor's picks match \"<em>%(query_string)s</em>\""
-msgstr "Ne pare rău, \"<em>%(query_string)s</em>\" nu se potrivește cu nici o selecție editorială"
+msgstr ""
+"Ne pare rău, \"<em>%(query_string)s</em>\" nu se potrivește cu nici o "
+"selecție editorială"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:21
+#: templates/wagtailsearch/editorspicks/results.html:21
 #, python-format
 msgid ""
-"No editor's picks have been created. Why not <a "
-"href=\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
-msgstr "Nu a fost creată nici o selecție editorială. De ce să nu <a href=\"%(wagtailsearch_editorspicks_add_url)s\">adăugați una</a>?"
+"No editor's picks have been created. Why not <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
+msgstr ""
+"Nu a fost creată nici o selecție editorială. De ce să nu <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">adăugați una</a>?"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:4
 msgid "Move up"
 msgstr "Deplasează în sus"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:5
 msgid "Move down"
 msgstr "Deplasează în jos"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:10
 msgid "Editors pick"
 msgstr "Selecție editorială"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html:14
 msgid "Add recommended page"
 msgstr "Adaugă pagină recomandată"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+#: templates/wagtailsearch/queries/chooser/chooser.html:2
 msgid "Popular search terms"
 msgstr "Termeni populari de căutare"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+#: templates/wagtailsearch/queries/chooser/chooser.html:11
 msgid "Search"
 msgstr "Căutare"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:8
+#: templates/wagtailsearch/queries/chooser/results.html:7
 msgid "Terms"
 msgstr "Termeni"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:23
+#: templates/wagtailsearch/queries/chooser/results.html:22
 msgid "No results found"
 msgstr "Nu sunt rezultate"
 
-#: .\views\editorspicks.py:41
+#: views/editorspicks.py:47
 msgid "Search editor's picks"
 msgstr "Caută selecții editoriale"
 
-#: .\views\editorspicks.py:75
+#: views/editorspicks.py:83
 msgid "Editor's picks for '{0}' created."
 msgstr "Selecțiile editoriale pentru '{0}' au fost create."
 
-#: .\views\editorspicks.py:103
+#: views/editorspicks.py:89
+msgid "Recommendations have not been created due to errors"
+msgstr ""
+
+#: views/editorspicks.py:117
 msgid "Editor's picks for '{0}' updated."
 msgstr "Selecțiile editoriale pentru '{0}' au fost actualizate."
 
-#: .\views\editorspicks.py:122
+#: views/editorspicks.py:123
+msgid "Recommendations have not been saved due to errors"
+msgstr ""
+
+#: views/editorspicks.py:142
 msgid "Editor's picks deleted."
 msgstr "Selecțiile editoriale au fost șterse"
diff --git a/wagtail/wagtailsearch/locale/zh/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/zh/LC_MESSAGES/django.po
index 8277ba9e41..a5007c7b22 100644
--- a/wagtail/wagtailsearch/locale/zh/LC_MESSAGES/django.po
+++ b/wagtail/wagtailsearch/locale/zh/LC_MESSAGES/django.po
@@ -1,120 +1,141 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"POT-Creation-Date: 2014-07-11 10:54+0000\n"
 "PO-Revision-Date: 2014-03-14 21:12+0000\n"
 "Last-Translator: serafeim <serafeim@torchbox.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/wagtail/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/wagtail/language/"
+"zh/)\n"
+"Language: zh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: .\forms.py:8
+#: forms.py:9
 msgid "Search term(s)/phrase"
 msgstr "搜索关键词"
 
-#: .\forms.py:9
+#: forms.py:10
 msgid ""
 "Enter the full search string to match. An \n"
 "        exact match is required for your Editors Picks to be \n"
 "        displayed, wildcards are NOT allowed."
-msgstr "输入完整的字符来匹配. \n        必须输入完全一样的编辑精选进行匹配 \n        不允许匹配"
+msgstr ""
+"输入完整的字符来匹配. \n"
+"        必须输入完全一样的编辑精选进行匹配 \n"
+"        不允许匹配"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:3
-#: .\templates\wagtailsearch\editorspicks\add.html:5
+#: forms.py:36
+msgid "Please specify at least one recommendation for this search term."
+msgstr ""
+
+#: wagtail_hooks.py:22 templates/wagtailsearch/editorspicks/list.html:9
+msgid "Editors picks"
+msgstr "编辑精选"
+
+#: templates/wagtailsearch/editorspicks/add.html:3
+#: templates/wagtailsearch/editorspicks/add.html:5
 msgid "Add editor's pick"
 msgstr "添加编辑精选"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:9
+#: templates/wagtailsearch/editorspicks/add.html:9
 msgid ""
 "\n"
-"        <p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like \"<em>giving</em>\".</p>\n"
+"        <p>Editors picks are a means of recommending specific pages that "
+"might not organically come high up in search results. E.g recommending your "
+"primary donation page to a user searching with a less common term like "
+"\"<em>giving</em>\".</p>\n"
+"        "
+msgstr ""
+"\n"
+"        <p>编辑精选是用于推荐部分在搜索排名不高的页面. 比如用关键词推荐用户到"
+"捐助页面。</p>\n"
 "        "
-msgstr "\n        <p>编辑精选是用于推荐部分在搜索排名不高的页面. 比如用关键词推荐用户到捐助页面。</p>\n        "
 
-#: .\templates\wagtailsearch\editorspicks\add.html:12
+#: templates/wagtailsearch/editorspicks/add.html:12
 msgid ""
 "\n"
-"        <p>The \"Search term(s)/phrase\" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>\n"
+"        <p>The \"Search term(s)/phrase\" field below must contain the full "
+"and exact search for which you wish to provide recommended results, "
+"<em>including</em> any misspellings/user error. To help, you can choose from "
+"search terms that have been popular with users of your site.</p>\n"
+"        "
+msgstr ""
+"\n"
+"        <p>下面空格中的搜索关键词必须是你希望提供推荐结果的完整关键词，<em>包"
+"括</em>任何可能错拼的词组. 提示，你可以从流行的搜索关键词中选择.</p>\n"
 "        "
-msgstr "\n        <p>下面空格中的搜索关键词必须是你希望提供推荐结果的完整关键词，<em>包括</em>任何可能错拼的词组. 提示，你可以从流行的搜索关键词中选择.</p>\n        "
 
-#: .\templates\wagtailsearch\editorspicks\add.html:25
-#: .\templates\wagtailsearch\editorspicks\edit.html:19
+#: templates/wagtailsearch/editorspicks/add.html:25
+#: templates/wagtailsearch/editorspicks/edit.html:19
 msgid "Save"
 msgstr "保存"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr "删除Delete %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:5
-#: .\templates\wagtailsearch\editorspicks\edit.html:20
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:6
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:20
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:6
 msgid "Delete"
 msgstr "删除"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:9
-msgid ""
-"Are you sure you want to delete all editors picks for this search term?"
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:9
+msgid "Are you sure you want to delete all editors picks for this search term?"
 msgstr "你确定你想要删除所有匹配这个关键词的编辑精选吗?"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:12
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:12
 msgid "Yes, delete"
 msgstr "是的，删除"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#: templates/wagtailsearch/editorspicks/edit.html:3
 #, python-format
 msgid "Editing %(query)s"
 msgstr "编辑%(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:5
 msgid "Editing"
 msgstr "编辑"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:3
+#: templates/wagtailsearch/editorspicks/index.html:3
 msgid "Search Terms"
 msgstr "搜索关键词"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:17
+#: templates/wagtailsearch/editorspicks/index.html:17
 msgid "Editor's search picks"
 msgstr "编辑精选"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:18
+#: templates/wagtailsearch/editorspicks/index.html:18
 msgid "Add new editor's pick"
 msgstr "添加新的编辑精选"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:8
+#: templates/wagtailsearch/editorspicks/list.html:8
 msgid "Search term(s)"
 msgstr "搜索关键词"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:9
-msgid "Editors picks"
-msgstr "编辑精选"
-
-#: .\templates\wagtailsearch\editorspicks\list.html:10
-#: .\templates\wagtailsearch\queries\chooser\results.html:9
+#: templates/wagtailsearch/editorspicks/list.html:10
+#: templates/wagtailsearch/queries/chooser/results.html:8
 msgid "Views (past week)"
 msgstr "查看 （上周）"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:17
+#: templates/wagtailsearch/editorspicks/list.html:17
 msgid "Edit this pick"
 msgstr "编辑这个精选"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:23
+#: templates/wagtailsearch/editorspicks/list.html:23
 msgid "None"
 msgstr "没有"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:5
+#: templates/wagtailsearch/editorspicks/results.html:5
 #, python-format
 msgid ""
 "\n"
@@ -126,62 +147,72 @@ msgid_plural ""
 "        "
 msgstr[0] ""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:18
+#: templates/wagtailsearch/editorspicks/results.html:18
 #, python-format
 msgid "Sorry, no editor's picks match \"<em>%(query_string)s</em>\""
 msgstr ""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:21
+#: templates/wagtailsearch/editorspicks/results.html:21
 #, python-format
 msgid ""
-"No editor's picks have been created. Why not <a "
-"href=\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
-msgstr "没有任何已保存的编辑精选. 为什么不 <a href=\"%(wagtailsearch_editorspicks_add_url)s\">加入一个</a>?"
+"No editor's picks have been created. Why not <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
+msgstr ""
+"没有任何已保存的编辑精选. 为什么不 <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">加入一个</a>?"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:4
 msgid "Move up"
 msgstr "向上移动"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:5
 msgid "Move down"
 msgstr "向下移动"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:10
 msgid "Editors pick"
 msgstr "编辑精选"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html:14
 msgid "Add recommended page"
 msgstr "添加推荐页"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+#: templates/wagtailsearch/queries/chooser/chooser.html:2
 msgid "Popular search terms"
 msgstr "流行的搜索关键词"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+#: templates/wagtailsearch/queries/chooser/chooser.html:11
 msgid "Search"
 msgstr "搜索"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:8
+#: templates/wagtailsearch/queries/chooser/results.html:7
 msgid "Terms"
 msgstr "关键词"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:23
+#: templates/wagtailsearch/queries/chooser/results.html:22
 msgid "No results found"
 msgstr "没有找到任何结果"
 
-#: .\views\editorspicks.py:41
+#: views/editorspicks.py:47
 msgid "Search editor's picks"
 msgstr ""
 
-#: .\views\editorspicks.py:75
+#: views/editorspicks.py:83
 msgid "Editor's picks for '{0}' created."
 msgstr "编辑精选'{0}'已创建。"
 
-#: .\views\editorspicks.py:103
+#: views/editorspicks.py:89
+msgid "Recommendations have not been created due to errors"
+msgstr ""
+
+#: views/editorspicks.py:117
 msgid "Editor's picks for '{0}' updated."
 msgstr "编辑精选'{0}'已更新。"
 
-#: .\views\editorspicks.py:122
+#: views/editorspicks.py:123
+msgid "Recommendations have not been saved due to errors"
+msgstr ""
+
+#: views/editorspicks.py:142
 msgid "Editor's picks deleted."
 msgstr "编辑精选已删除"
diff --git a/wagtail/wagtailsearch/locale/zh_TW/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/zh_TW/LC_MESSAGES/django.po
index f322e51b3f..4b74195b5c 100644
--- a/wagtail/wagtailsearch/locale/zh_TW/LC_MESSAGES/django.po
+++ b/wagtail/wagtailsearch/locale/zh_TW/LC_MESSAGES/django.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"POT-Creation-Date: 2014-07-11 10:54+0000\n"
 "PO-Revision-Date: 2014-03-14 21:12+0000\n"
 "Last-Translator: wdv4758h <wdv4758h@gmail.com>\n"
 "Language-Team: \n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: .\forms.py:8
+#: forms.py:9
 msgid "Search term(s)/phrase"
 msgstr "搜尋關鍵字"
 
-#: .\forms.py:9
+#: forms.py:10
 msgid ""
 "Enter the full search string to match. An \n"
 "        exact match is required for your Editors Picks to be \n"
@@ -31,93 +31,110 @@ msgstr ""
 "        輸入必須和你的 '編者精選' 完全一樣 \n"
 "        (不能使用萬用字元)"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:3
-#: .\templates\wagtailsearch\editorspicks\add.html:5
+#: forms.py:36
+msgid "Please specify at least one recommendation for this search term."
+msgstr ""
+
+#: wagtail_hooks.py:22 templates/wagtailsearch/editorspicks/list.html:9
+msgid "Editors picks"
+msgstr "編者精選"
+
+#: templates/wagtailsearch/editorspicks/add.html:3
+#: templates/wagtailsearch/editorspicks/add.html:5
 msgid "Add editor's pick"
 msgstr "新增編者精選"
 
-#: .\templates\wagtailsearch\editorspicks\add.html:9
+#: templates/wagtailsearch/editorspicks/add.html:9
 msgid ""
 "\n"
-"        <p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like \"<em>giving</em>\".</p>\n"
+"        <p>Editors picks are a means of recommending specific pages that "
+"might not organically come high up in search results. E.g recommending your "
+"primary donation page to a user searching with a less common term like "
+"\"<em>giving</em>\".</p>\n"
+"        "
+msgstr ""
+"\n"
+"        <p>編者精選是用於推薦部份在搜尋排名不高的頁面。 例如用關鍵字推薦使用"
+"者到捐獻頁面。</p>\n"
 "        "
-msgstr "\n        <p>編者精選是用於推薦部份在搜尋排名不高的頁面。 例如用關鍵字推薦使用者到捐獻頁面。</p>\n        "
 
-#: .\templates\wagtailsearch\editorspicks\add.html:12
+#: templates/wagtailsearch/editorspicks/add.html:12
 msgid ""
 "\n"
-"        <p>The \"Search term(s)/phrase\" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>\n"
+"        <p>The \"Search term(s)/phrase\" field below must contain the full "
+"and exact search for which you wish to provide recommended results, "
+"<em>including</em> any misspellings/user error. To help, you can choose from "
+"search terms that have been popular with users of your site.</p>\n"
+"        "
+msgstr ""
+"\n"
+"        <p>下面的關鍵字必須是你希望推薦結果的完整關鍵字，<em>包括</em>任何可"
+"能拼錯的詞。 提示，你可以從熱門的關鍵字選擇。</p>\n"
 "        "
-msgstr "\n        <p>下面的關鍵字必須是你希望推薦結果的完整關鍵字，<em>包括</em>任何可能拼錯的詞。 提示，你可以從熱門的關鍵字選擇。</p>\n        "
 
-#: .\templates\wagtailsearch\editorspicks\add.html:25
-#: .\templates\wagtailsearch\editorspicks\edit.html:19
+#: templates/wagtailsearch/editorspicks/add.html:25
+#: templates/wagtailsearch/editorspicks/edit.html:19
 msgid "Save"
 msgstr "儲存"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr "刪除 Delete %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:5
-#: .\templates\wagtailsearch\editorspicks\edit.html:20
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:6
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:20
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:6
 msgid "Delete"
 msgstr "刪除"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:9
-msgid ""
-"Are you sure you want to delete all editors picks for this search term?"
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:9
+msgid "Are you sure you want to delete all editors picks for this search term?"
 msgstr "你確定想要刪除所有搜尋到的編者精選？"
 
-#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:12
+#: templates/wagtailsearch/editorspicks/confirm_delete.html:12
 msgid "Yes, delete"
 msgstr "是的，刪除"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#: templates/wagtailsearch/editorspicks/edit.html:3
 #, python-format
 msgid "Editing %(query)s"
 msgstr "編輯 %(query)s"
 
-#: .\templates\wagtailsearch\editorspicks\edit.html:5
+#: templates/wagtailsearch/editorspicks/edit.html:5
 msgid "Editing"
 msgstr "編輯"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:3
+#: templates/wagtailsearch/editorspicks/index.html:3
 msgid "Search Terms"
 msgstr "搜尋關鍵字"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:17
+#: templates/wagtailsearch/editorspicks/index.html:17
 msgid "Editor's search picks"
 msgstr "編者精選"
 
-#: .\templates\wagtailsearch\editorspicks\index.html:18
+#: templates/wagtailsearch/editorspicks/index.html:18
 msgid "Add new editor's pick"
 msgstr "新增新的編者精選"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:8
+#: templates/wagtailsearch/editorspicks/list.html:8
 msgid "Search term(s)"
 msgstr "搜尋關鍵字"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:9
-msgid "Editors picks"
-msgstr "編者精選"
-
-#: .\templates\wagtailsearch\editorspicks\list.html:10
-#: .\templates\wagtailsearch\queries\chooser\results.html:9
+#: templates/wagtailsearch/editorspicks/list.html:10
+#: templates/wagtailsearch/queries/chooser/results.html:8
 msgid "Views (past week)"
 msgstr "觀看 （上周）"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:17
+#: templates/wagtailsearch/editorspicks/list.html:17
 msgid "Edit this pick"
 msgstr "編輯這個精選"
 
-#: .\templates\wagtailsearch\editorspicks\list.html:23
+#: templates/wagtailsearch/editorspicks/list.html:23
 msgid "None"
 msgstr "沒有"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:5
+#: templates/wagtailsearch/editorspicks/results.html:5
 #, python-format
 msgid ""
 "\n"
@@ -127,65 +144,79 @@ msgid_plural ""
 "\n"
 "            There are %(counter)s matches\n"
 "        "
-msgstr[0] "\n            有一個符合"
-msgstr[1] "\n            有 $(counter)s 個符合"
+msgstr[0] ""
+"\n"
+"            有一個符合"
+msgstr[1] ""
+"\n"
+"            有 $(counter)s 個符合"
 
-#: .\templates\wagtailsearch\editorspicks\results.html:18
+#: templates/wagtailsearch/editorspicks/results.html:18
 #, python-format
 msgid "Sorry, no editor's picks match \"<em>%(query_string)s</em>\""
 msgstr "對不起，沒有任何編者精選符合 \"<em>%(query_string)s</em>\""
 
-#: .\templates\wagtailsearch\editorspicks\results.html:21
+#: templates/wagtailsearch/editorspicks/results.html:21
 #, python-format
 msgid ""
-"No editor's picks have been created. Why not <a "
-"href=\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
-msgstr "沒有任何編者精選。 為什麼不 <a href=\"%(wagtailsearch_editorspicks_add_url)s\">建立一個呢</a>?"
+"No editor's picks have been created. Why not <a href="
+"\"%(wagtailsearch_editorspicks_add_url)s\">add one</a>?"
+msgstr ""
+"沒有任何編者精選。 為什麼不 <a href=\"%(wagtailsearch_editorspicks_add_url)s"
+"\">建立一個呢</a>?"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:4
 msgid "Move up"
 msgstr "往上移動"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:5
 msgid "Move down"
 msgstr "往下移動"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_form.html:10
 msgid "Editors pick"
 msgstr "編者精選"
 
-#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+#: templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html:14
 msgid "Add recommended page"
 msgstr "新增推薦頁面"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+#: templates/wagtailsearch/queries/chooser/chooser.html:2
 msgid "Popular search terms"
 msgstr "熱門的關鍵字"
 
-#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+#: templates/wagtailsearch/queries/chooser/chooser.html:11
 msgid "Search"
 msgstr "搜尋"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:8
+#: templates/wagtailsearch/queries/chooser/results.html:7
 msgid "Terms"
 msgstr "關鍵字"
 
-#: .\templates\wagtailsearch\queries\chooser\results.html:23
+#: templates/wagtailsearch/queries/chooser/results.html:22
 msgid "No results found"
 msgstr "沒有找到任何結果"
 
-#: .\views\editorspicks.py:41
+#: views/editorspicks.py:47
 msgid "Search editor's picks"
 msgstr "搜尋編者精選"
 
-#: .\views\editorspicks.py:75
+#: views/editorspicks.py:83
 msgid "Editor's picks for '{0}' created."
 msgstr "編者精選'{0}'已建立。"
 
-#: .\views\editorspicks.py:103
+#: views/editorspicks.py:89
+msgid "Recommendations have not been created due to errors"
+msgstr ""
+
+#: views/editorspicks.py:117
 msgid "Editor's picks for '{0}' updated."
 msgstr "編者精選'{0}'已更新。"
 
-#: .\views\editorspicks.py:122
+#: views/editorspicks.py:123
+msgid "Recommendations have not been saved due to errors"
+msgstr ""
+
+#: views/editorspicks.py:142
 msgid "Editor's picks deleted."
 msgstr "編者精選已刪除"