diff --git a/.tx/config b/.tx/config
index 2cddc45134..84719c7fce 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,6 +1,12 @@
 [main]
 host = https://www.transifex.com
 
+[wagtail.wagtailsearch]
+file_filter = wagtail/wagtailsearch/locale/<lang>/LC_MESSAGES/django.po
+source_file = wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.po
+source_lang = en
+type = PO
+
 [wagtail.wagtailsnippets]
 file_filter = wagtail/wagtailsnippets/locale/<lang>/LC_MESSAGES/django.po
 source_file = wagtail/wagtailsnippets/locale/en/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailsearch/forms.py b/wagtail/wagtailsearch/forms.py
index 873c622557..03e4ecd45d 100644
--- a/wagtail/wagtailsearch/forms.py
+++ b/wagtail/wagtailsearch/forms.py
@@ -1,11 +1,15 @@
 from django import forms
 from django.forms.models import inlineformset_factory
-
+from django.utils.translation import ugettext_lazy as _
 import models
 
 
 class QueryForm(forms.Form):
-    query_string = forms.CharField(label='Search term(s)/phrase', help_text="Enter the full search string to match. An exact match is required for your Editors Picks to be displayed, wildcards are NOT allowed.", required=True)
+    query_string = forms.CharField(label=_('Search term(s)/phrase'), 
+        help_text=_("""Enter the full search string to match. An 
+        exact match is required for your Editors Picks to be 
+        displayed, wildcards are NOT allowed."""), 
+        required=True)
 
 
 class EditorsPickForm(forms.ModelForm):
diff --git a/wagtail/wagtailsearch/locale/el/LC_MESSAGES/django.mo b/wagtail/wagtailsearch/locale/el/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..70f33a6410
Binary files /dev/null and b/wagtail/wagtailsearch/locale/el/LC_MESSAGES/django.mo differ
diff --git a/wagtail/wagtailsearch/locale/el/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/el/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..eb218d474d
--- /dev/null
+++ b/wagtail/wagtailsearch/locale/el/LC_MESSAGES/django.po
@@ -0,0 +1,191 @@
+# 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
+msgid ""
+msgstr ""
+"Project-Id-Version: Wagtail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-20 00:14+0200\n"
+"PO-Revision-Date: 2014-02-19 21:25+0000\n"
+"Last-Translator: serafeim <serafeim@torchbox.com>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/wagtail/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
+msgid "Search term(s)/phrase"
+msgstr ""
+
+#: .\forms.py:9
+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
+msgid "Add editor's pick"
+msgstr ""
+
+#: .\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"
+"        "
+msgstr ""
+
+#: .\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"
+"        "
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\add.html:25
+#: .\templates\wagtailsearch\editorspicks\edit.html:19
+msgid "Save"
+msgstr "Αποθήκευση"
+
+#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#, python-format
+msgid "Delete %(query.query_string)s"
+msgstr "Διαγραφή %(query.query_string)s"
+
+#: .\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:12
+msgid "Yes, delete"
+msgstr "Ναι, να διαγραφεί"
+
+#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#, python-format
+msgid "Editing %(query.query_string)s"
+msgstr "Διόρθωση του %(query.query_string)s"
+
+#: .\templates\wagtailsearch\editorspicks\edit.html:5
+msgid "Editing"
+msgstr "Διόρθωση"
+
+#: .\templates\wagtailsearch\editorspicks\index.html:3
+msgid "Search Terms"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\index.html:17
+msgid "Editor's search picks"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\index.html:18
+msgid "Add new editor's pick"
+msgstr ""
+
+#: .\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
+msgid "Views (past week)"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\list.html:17
+msgid "Edit this pick"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\list.html:23
+msgid "None"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\results.html:5
+#, python-format
+msgid ""
+"\n"
+"            There is one match\n"
+"        "
+msgid_plural ""
+"\n"
+"            There are %(counter)s matches\n"
+"        "
+msgstr[0] ""
+msgstr[1] ""
+
+#: .\templates\wagtailsearch\editorspicks\results.html:18
+#, python-format
+msgid "Sorry, no editor's picks match \"<em>%(search_query)s</em>\""
+msgstr ""
+
+#: .\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 ""
+
+#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:4
+msgid "Move up"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+msgid "Move down"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+msgid "Editors pick"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+msgid "Add recommended page"
+msgstr ""
+
+#: .\templates\wagtailsearch\queries\chooser\chooser.html:2
+msgid "Popular search terms"
+msgstr ""
+
+#: .\templates\wagtailsearch\queries\chooser\chooser.html:10
+msgid "Search"
+msgstr ""
+
+#: .\templates\wagtailsearch\queries\chooser\results.html:8
+msgid "Terms"
+msgstr ""
+
+#: .\templates\wagtailsearch\queries\chooser\results.html:23
+msgid "No results found"
+msgstr ""
+
+#: .\views\editorspicks.py:85
+msgid "Editor's picks for '{0}' created."
+msgstr ""
+
+#: .\views\editorspicks.py:113
+msgid "Editor's picks for '{0}' updated."
+msgstr ""
+
+#: .\views\editorspicks.py:132
+msgid "Editor's picks deleted."
+msgstr ""
diff --git a/wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.mo b/wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..08cd61d88b
Binary files /dev/null and b/wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.mo differ
diff --git a/wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.po b/wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..b2dbd5e103
--- /dev/null
+++ b/wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.po
@@ -0,0 +1,154 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-19 23:22+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: .\forms.py:8
+msgid "Search term(s)/phrase"
+msgstr ""
+
+#: .\forms.py:9
+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
+msgid "Add editor's pick"
+msgstr ""
+
+#: .\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"
+"        "
+msgstr ""
+
+#: .\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"
+"        "
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\add.html:25
+#: .\templates\wagtailsearch\editorspicks\edit.html:19
+msgid "Save"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\confirm_delete.html:3
+#, python-format
+msgid "Delete %(query.query_string)s"
+msgstr ""
+
+#: .\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:12
+msgid "Yes, delete"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\edit.html:3
+#, python-format
+msgid "Editing %(query.query_string)s"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\edit.html:5
+msgid "Editing"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\index.html:3
+msgid "Search Terms"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\index.html:17
+msgid "Editor's search picks"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\index.html:18
+msgid "Add new editor's pick"
+msgstr ""
+
+#: .\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
+msgid "Views (past week)"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\list.html:23
+msgid "None"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\results.html:11
+#, python-format
+msgid "Sorry, no editor's picks match \"<em>%(search_query)s</em>\""
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\results.html:14
+#, python-format
+msgid ""
+"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
+msgid "Move up"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:5
+msgid "Move down"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_form.html:10
+msgid "Editors pick"
+msgstr ""
+
+#: .\templates\wagtailsearch\editorspicks\includes\editorspicks_formset.html:14
+msgid "Add recommended page"
+msgstr ""
+
+#: .\views\editorspicks.py:85
+msgid "Editor's picks for '{0}' created."
+msgstr ""
+
+#: .\views\editorspicks.py:113
+msgid "Editor's picks for '{0}' updated."
+msgstr ""
+
+#: .\views\editorspicks.py:132
+msgid "Editor's picks deleted."
+msgstr ""
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html
index 327124b4c4..52f183a95d 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html
@@ -1,13 +1,17 @@
 {% extends "wagtailadmin/base.html" %}
-{% block titletag %}Add editors pick{% endblock %}
+{% load i18n %}
+{% block titletag %}{% trans "Add editor's pick" %}{% endblock %}
 {% block content %}
-    {% include "wagtailadmin/shared/header.html" with title="Add editor's pick" %}
+    {% trans "Add editor's pick" as add_str %}
+    {% include "wagtailadmin/shared/header.html" with title=add_str %}
 
     <div class="nice-padding">
+        {% blocktrans %}
         <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>
-
+        {% endblocktrans %}
+        {% blocktrans %}
         <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>
-
+        {% endblocktrans %}
         <form action="{% url 'wagtailsearch_editorspicks_add' %}" method="POST">
             {% csrf_token %}
 
@@ -18,7 +22,7 @@
                 <li>
                     {% include "wagtailsearch/editorspicks/includes/editorspicks_formset.html" with formset=editors_pick_formset only %}
                 </li>
-                <li><input type="submit" value="Save" /></li>
+                <li><input type="submit" value="{% trans 'Save' %}" /></li>
             </ul>
         </form>
     </div>
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/confirm_delete.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/confirm_delete.html
index 96124f7524..1ae70117a7 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/confirm_delete.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/confirm_delete.html
@@ -1,15 +1,15 @@
 {% extends "wagtailadmin/base.html" %}
-
-{% block titletag %}Delete {{ query.query_string }}{% endblock %}
+{% load i18n %}
+{% block titletag %}{% blocktrans %}Delete {{ query.query_string }}{% endblocktrans %}{% endblock %}
 {% block content %}
-
-    {% include "wagtailadmin/shared/header.html" with title="Delete" subtitle=query.query_string %}
+    {% trans "Delete" as delete_str %}
+    {% include "wagtailadmin/shared/header.html" with title=delete_str subtitle=query.query_string %}
 
     <div class="nice-padding">       
-        <p>Are you sure you want to delete all editors picks for this search term?</p>
+        <p>{% trans "Are you sure you want to delete all editors picks for this search term?" %}</p>
         <form action="{% url 'wagtailsearch_editorspicks_delete' query.id %}" method="POST">
             {% csrf_token %}
-            <input type="submit" value="Yes, delete" class="serious" />
+            <input type="submit" value="{% trans 'Yes, delete' %}" class="serious" />
         </form>
     </div>
 {% endblock %}
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/edit.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/edit.html
index 222dfea5f7..7cc2692fdb 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/edit.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/edit.html
@@ -1,8 +1,9 @@
 {% extends "wagtailadmin/base.html" %}
-{% block titletag %}Editing {{ query.query_string }}{% endblock %}
+{% load i18n %}
+{% block titletag %}{% blocktrans %}Editing {{ query.query_string }}{% endblocktrans %}{% endblock %}
 {% block content %}
-    
-    {% include "wagtailadmin/shared/header.html" with title="Editing" subtitle=query.query_string %}
+    {% trans "Editing" as editing_str %}
+    {% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=query.query_string %}
 
     <form action="{% url 'wagtailsearch_editorspicks_edit' query.id %}" method="POST" class="nice-padding">
         {% csrf_token %}
@@ -15,8 +16,8 @@
                 {% include "wagtailsearch/editorspicks/includes/editorspicks_formset.html" with formset=editors_pick_formset only %}
             </li>
             <li>
-                <input type="submit" value="Save" />
-                <a href="{% url 'wagtailsearch_editorspicks_delete' query.id %}" class="button button-secondary no">Delete</a>
+                <input type="submit" value="{% trans 'Save' %}" />
+                <a href="{% url 'wagtailsearch_editorspicks_delete' query.id %}" class="button button-secondary no">{% trans "Delete" %}</a>
             </li>
         </ul>
     </form>
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html
index bb5a4a6469..01e891ccd2 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html
@@ -1,12 +1,13 @@
+{% load i18n %}
 <li id="inline_child_{{ form.prefix }}"{% if form.DELETE.value %} style="display: none;"{% endif %}>
     <ul class="controls">
-        <li class="icon text-replace icon-order-up inline-child-move-up" id="{{ form.prefix }}-move-up">Move up</li>
-        <li class="icon text-replace icon-order-down inline-child-move-down" id="{{ form.prefix }}-move-down">Move down</li>
-        <li class="icon text-replace icon-bin" id="{{ form.DELETE.id_for_label }}-button">Delete</li>
+        <li class="icon text-replace icon-order-up inline-child-move-up" id="{{ form.prefix }}-move-up">{% trans "Move up" %}</li>
+        <li class="icon text-replace icon-order-down inline-child-move-down" id="{{ form.prefix }}-move-down">{% trans "Move down" %}</li>
+        <li class="icon text-replace icon-bin" id="{{ form.DELETE.id_for_label }}-button">{% trans "Delete" %}</li>
     </ul>
 
     <fieldset>
-        <legend>Editors pick</legend>
+        <legend>{% trans "Editors pick" %}</legend>
         <ul class="fields">
             <li class="model_choice_field">
                 {% if form.instance.page %}
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html
index b269d26769..eb41892b6b 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_formset.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 {{ formset.management_form }}
 <ul class="multiple" id="id_{{ formset.prefix }}-FORMS">
     {% for form in formset.forms %}
@@ -10,5 +11,5 @@
 </script>
 
 <p class="add">
-    <a class="button bicolor icon icon-plus" id="id_{{ formset.prefix }}-ADD" value="Add">Add recommended page</a>
+    <a class="button bicolor icon icon-plus" id="id_{{ formset.prefix }}-ADD" value="Add">{% trans "Add recommended page" %}</a>
 </p>
\ No newline at end of file
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/index.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/index.html
index 2c0948e0a1..3c25785eec 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/index.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/index.html
@@ -1,5 +1,6 @@
 {% extends "wagtailadmin/base.html" %}
-{% block titletag %}Search Terms{% endblock %}
+{% load i18n %}
+{% block titletag %}{% trans "Search Terms" %}{% endblock %}
 {% block bodyclass %}menu-editorspicks{% endblock %}
 
 {% block extra_js %}
@@ -13,7 +14,9 @@
 {% endblock %}
 
 {% block content %}
-    {% include "wagtailadmin/shared/header.html" with title="Editor's search picks" add_link="wagtailsearch_editorspicks_add" add_text="Add new editor's pick" search_url="wagtailsearch_editorspicks_index" %}
+    {% trans "Editor's search picks" as sp_title_str %}
+    {% trans "Add new editor's pick" as sp_text_str %}
+    {% include "wagtailadmin/shared/header.html" with title=sp_title_str add_link="wagtailsearch_editorspicks_add" add_text=sp_text_str search_url="wagtailsearch_editorspicks_index" %}
 
      <div class="nice-padding">
         <div id="editorspicks-results" class="redirects">
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/list.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/list.html
index 0118c57a8f..d6d1b57d4f 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/list.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/list.html
@@ -1,25 +1,26 @@
+{% load i18n %}
 <table class="listing">
     <col width="40%" />
     <col width="40%"/>
     <col />
     <thead>
         <tr>
-            <th class="title">Search term(s)</th>
-            <th>Editors picks</th>
-            <th>Views (past week)</th>
+            <th class="title">{% trans "Search term(s)" %}</th>
+            <th>{% trans "Editors picks" %}</th>
+            <th>{% trans "Views (past week)" %}</th>
         </tr>
     </thead>
     <tbody>
         {% for query in queries %}
             <tr>
                 <td class="title">
-                    <h2><a href="{% url 'wagtailsearch_editorspicks_edit' query.id %}" title="Edit this pick">{{ query.query_string }}</a></h2>
+                    <h2><a href="{% url 'wagtailsearch_editorspicks_edit' query.id %}" title="{% trans 'Edit this pick' %}">{{ query.query_string }}</a></h2>
                 </td>
                 <td>
                     {% for editors_pick in query.editors_picks.all %}
                         <a href="{% url 'wagtailadmin_pages_edit' editors_pick.page.id %}" class="nolink">{{ editors_pick.page.title }}</a>{% if not forloop.last %}, {% endif %}
                     {% empty %}
-                        None
+                        {% trans "None" %}
                     {% endfor %}
                 </td>
                 <td>{{ query.hits }}</td>
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/results.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/results.html
index 1b8e3620ac..332d66e5e3 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/results.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/results.html
@@ -1,6 +1,13 @@
+{% load i18n %}
 {% if queries %}
     {% if is_searching %}
-        <h2>{{ queries|length }} match{{ queries|pluralize:"es" }}</h2>
+        <h2>
+        {% blocktrans count counter=queries|length %}
+            There is one match
+        {% plural %}
+            There are {{ counter }} matches
+        {% endblocktrans %}
+        </h2>
     {% endif %}
 
     {% include "wagtailsearch/editorspicks/list.html" %}
@@ -8,8 +15,9 @@
 	{% include "wagtailadmin/shared/pagination_nav.html" with items=queries is_searching=is_searching linkurl="wagtailsearch_editorspicks_index" %}
 {% else %}
  	{% if is_searching %}
-         <p>Sorry, no editor's picks match "<em>{{ search_query }}</em>"
+         <p>{% blocktrans %}Sorry, no editor's picks match "<em>{{ search_query }}</em>"{% endblocktrans %}</p>
     {% else %}
-        <p>No editor's picks have been created. Why not <a href="{% url 'wagtailsearch_editorspicks_add' %}">add one</a>?</p>
+        {% url 'wagtailsearch_editorspicks_add' as wagtailsearch_editorspicks_add_url %}
+        <p>{% blocktrans %}No editor's picks have been created. Why not <a href="{{ wagtailsearch_editorspicks_add_url }}">add one</a>?{% endblocktrans %}</p>
     {% endif %}
 {% endif %}
\ No newline at end of file
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html
index b62a4b528a..b78f94b603 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html
@@ -1,11 +1,13 @@
-{% include "wagtailadmin/shared/header.html" with title="Popular search terms" %}
+{% load i18n %}
+{% trans "Popular search terms" as pop_str %}
+{% include "wagtailadmin/shared/header.html" with title=pop_str %}
 
 <form class="query-search search-bar full-width" action="{% url 'wagtailsearch_queries_chooserresults' %}" method="GET" autocomplete="off">
     <ul class="fields">
         {% for field in searchform %}
             {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
         {% endfor %}
-        <li class="submit"><input type="submit" value="Search" /></li>
+        <li class="submit"><input type="submit" value="{% trans 'Search' %}" /></li>
     </ul>
 </form>
 <div class="nice-padding">
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/results.html b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/results.html
index 05f6c6f86a..78de1e937b 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/results.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/results.html
@@ -1,11 +1,12 @@
+{% load i18n %}
 <table class="listing chooser">
     <col />
     <col width="40%"/>
     <col />
     <thead>
         <tr>
-            <th class="title">Terms</th>
-            <th>Views (past week)</th>
+            <th class="title">{% trans "Terms" %}</th>
+            <th>{% trans "Views (past week)" %}</th>
         </tr>
     </thead>
     <tbody>
@@ -19,7 +20,7 @@
                 </tr>
             {% endfor %}
         {% else %}
-            <tr><td colspan="3" class="no-results-message"><p>No results found</p></td></tr>
+            <tr><td colspan="3" class="no-results-message"><p>{% trans "No results found" %}</p></td></tr>
         {% endif %}
     </tbody>
 </table>
diff --git a/wagtail/wagtailsearch/views/editorspicks.py b/wagtail/wagtailsearch/views/editorspicks.py
index 90f46ee889..2e5e604ff4 100644
--- a/wagtail/wagtailsearch/views/editorspicks.py
+++ b/wagtail/wagtailsearch/views/editorspicks.py
@@ -3,6 +3,7 @@ from django.contrib.auth.decorators import login_required
 from django.contrib import messages
 
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+from django.utils.translation import ugettext as _
 
 from wagtail.wagtailsearch import models, forms
 from wagtail.wagtailadmin.forms import SearchForm
@@ -81,7 +82,7 @@ def add(request):
             editors_pick_formset = forms.EditorsPickFormSet(request.POST, instance=query)
 
             if save_editorspicks(query, query, editors_pick_formset):
-                messages.success(request, "Editor's picks for '%s' created." % query)
+                messages.success(request, _("Editor's picks for '{0}' created.").format(query))
                 return redirect('wagtailsearch_editorspicks_index')
         else:
             editors_pick_formset = forms.EditorsPickFormSet()
@@ -109,7 +110,7 @@ def edit(request, query_id):
             editors_pick_formset = forms.EditorsPickFormSet(request.POST, instance=query)
 
             if save_editorspicks(query, new_query, editors_pick_formset):
-                messages.success(request, "Editor's picks for '%s' updated." % new_query)
+                messages.success(request, _("Editor's picks for '{0}' updated.").format(new_query))
                 return redirect('wagtailsearch_editorspicks_index')
     else:
         query_form = forms.QueryForm(initial=dict(query_string=query.query_string))
@@ -128,6 +129,7 @@ def delete(request, query_id):
 
     if request.POST:
         query.editors_picks.all().delete()
+        messages.success(request, _("Editor's picks deleted."))
         return redirect('wagtailsearch_editorspicks_index')
 
     return render(request, 'wagtailsearch/editorspicks/confirm_delete.html', {
diff --git a/wagtail/wagtailsnippets/locale/el/LC_MESSAGES/django.mo b/wagtail/wagtailsnippets/locale/el/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..3f7a8779a3
Binary files /dev/null and b/wagtail/wagtailsnippets/locale/el/LC_MESSAGES/django.mo differ
diff --git a/wagtail/wagtailsnippets/locale/el/LC_MESSAGES/django.po b/wagtail/wagtailsnippets/locale/el/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..10039824e5
--- /dev/null
+++ b/wagtail/wagtailsnippets/locale/el/LC_MESSAGES/django.po
@@ -0,0 +1,126 @@
+# 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
+msgid ""
+msgstr ""
+"Project-Id-Version: Wagtail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-20 00:15+0200\n"
+"PO-Revision-Date: 2014-02-19 21:31+0000\n"
+"Last-Translator: serafeim <serafeim@torchbox.com>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/wagtail/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"
+
+#: .\templates\wagtailsnippets\chooser\choose.html:2
+msgid "Choose"
+msgstr "Επιλογή"
+
+#: .\templates\wagtailsnippets\edit_handlers\snippet_chooser_panel.html:10
+#, python-format
+msgid "Choose another %(snippet_type_name)s"
+msgstr "Επιλογή άλλου %(snippet_type_name)s"
+
+#: .\templates\wagtailsnippets\edit_handlers\snippet_chooser_panel.html:11
+#, python-format
+msgid "Choose %(snippet_type_name)s"
+msgstr "Επιλογή %(snippet_type_name)s"
+
+#: .\templates\wagtailsnippets\snippets\confirm_delete.html:3
+#, python-format
+msgid "Delete %(snippet_type_name)s - %(instance)s"
+msgstr ""
+
+#: .\templates\wagtailsnippets\snippets\confirm_delete.html:6
+#: .\templates\wagtailsnippets\snippets\edit.html:20
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: .\templates\wagtailsnippets\snippets\confirm_delete.html:10
+#, python-format
+msgid "Are you sure you want to delete this %(snippet_type_name)s?"
+msgstr "Είστε σίγουροι ότι θέλετε να διαγραφεί αυτό το %(snippet_type_name)s;"
+
+#: .\templates\wagtailsnippets\snippets\confirm_delete.html:13
+msgid "Yes, delete"
+msgstr "Ναι, να διαγραφεί"
+
+#: .\templates\wagtailsnippets\snippets\create.html:3
+#, python-format
+msgid "New  %(snippet_type_name)s"
+msgstr "Δημιουργία %(snippet_type_name)s"
+
+#: .\templates\wagtailsnippets\snippets\create.html:6
+msgid "New"
+msgstr "Δημιουργία"
+
+#: .\templates\wagtailsnippets\snippets\create.html:17
+#: .\templates\wagtailsnippets\snippets\edit.html:17
+msgid "Save"
+msgstr "Αποθήκευση"
+
+#: .\templates\wagtailsnippets\snippets\edit.html:3
+#, python-format
+msgid "Editing %(snippet_type_name)s - %(instance)s"
+msgstr "Διόρθωση %(snippet_type_name)s - %(instance)s"
+
+#: .\templates\wagtailsnippets\snippets\edit.html:6
+msgid "Editing"
+msgstr "Διόρθωση"
+
+#: .\templates\wagtailsnippets\snippets\index.html:3
+msgid "Snippets"
+msgstr ""
+
+#: .\templates\wagtailsnippets\snippets\list.html:8
+msgid "Title"
+msgstr "Τίτλος"
+
+#: .\templates\wagtailsnippets\snippets\type_index.html:3
+#, python-format
+msgid "Snippets %(snippet_type_name_plural|capfirst)s"
+msgstr ""
+
+#: .\templates\wagtailsnippets\snippets\type_index.html:10
+#, python-format
+msgid "Snippets <span>%(snippet_type_name_plural|capfirst)s</span>"
+msgstr ""
+
+#: .\templates\wagtailsnippets\snippets\type_index.html:13
+#, python-format
+msgid "Add %(snippet_type_name)s"
+msgstr "Προσθήκη %(snippet_type_name)s"
+
+#: .\templates\wagtailsnippets\snippets\type_index.html:23
+#, python-format
+msgid ""
+"No %(snippet_type_name_plural)s have been created. Why not <a href=\"%"
+"(wagtailsnippets_create_url)s\">add one</a>?"
+msgstr ""
+
+#: .\views\snippets.py:127
+msgid "{snippet_type} '{instance}' created."
+msgstr ""
+
+#: .\views\snippets.py:134
+msgid "The snippet could not be created due to errors."
+msgstr ""
+
+#: .\views\snippets.py:168
+msgid "{snippet_type} '{instance}' updated."
+msgstr ""
+
+#: .\views\snippets.py:175
+msgid "The snippet could not be saved due to errors."
+msgstr ""
+
+#: .\views\snippets.py:204
+msgid "{snippet_type} '{instance}' deleted."
+msgstr ""
diff --git a/wagtail/wagtailsnippets/locale/en/LC_MESSAGES/django.mo b/wagtail/wagtailsnippets/locale/en/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..4912a58680
Binary files /dev/null and b/wagtail/wagtailsnippets/locale/en/LC_MESSAGES/django.mo differ
diff --git a/wagtail/wagtailusers/locale/el/LC_MESSAGES/django.mo b/wagtail/wagtailusers/locale/el/LC_MESSAGES/django.mo
index 0c80870cf3..a5f202ffe0 100644
Binary files a/wagtail/wagtailusers/locale/el/LC_MESSAGES/django.mo and b/wagtail/wagtailusers/locale/el/LC_MESSAGES/django.mo differ
diff --git a/wagtail/wagtailusers/locale/el/LC_MESSAGES/django.po b/wagtail/wagtailusers/locale/el/LC_MESSAGES/django.po
index 80ca004662..352d5e8e6a 100644
--- a/wagtail/wagtailusers/locale/el/LC_MESSAGES/django.po
+++ b/wagtail/wagtailusers/locale/el/LC_MESSAGES/django.po
@@ -4,12 +4,13 @@
 #
 # Translators:
 # serafeim <serafeim@torchbox.com>, 2014
+# serafeim <serafeim@torchbox.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-19 14:36+0200\n"
-"PO-Revision-Date: 2014-02-19 12:36+0000\n"
+"POT-Creation-Date: 2014-02-20 00:14+0200\n"
+"PO-Revision-Date: 2014-02-19 21:48+0000\n"
 "Last-Translator: serafeim <serafeim@torchbox.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/wagtail/language/"
 "el/)\n"
@@ -49,7 +50,7 @@ msgstr "Υπάρχει ήδη χρήστης με το συγκεκριμένο
 msgid "The two password fields didn't match."
 msgstr "Τα δύο πεδία κωδικών δεν είναι ίδια."
 
-#: .\forms.py:50 .\templates\wagtailusers\list.html.py:15
+#: .\forms.py:50 .\templates\wagtailusers\list.html:15
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
@@ -86,72 +87,85 @@ msgid "Administrators have the ability to manage user accounts."
 msgstr ""
 "Οι Διαχειριστές έχουν τη δυνατότητα να διαχειρίζονται λογαριασμούς χρηστών."
 
-#: .\templates\wagtailusers\create.html.py:8
-#: .\templates\wagtailusers\create.html.py:35
+#: .\templates\wagtailusers\create.html:4
+#: .\templates\wagtailusers\create.html:8
+#: .\templates\wagtailusers\create.html:35
 msgid "Add user"
 msgstr "Προσθήκη χρήστη"
 
-#: .\templates\wagtailusers\create.html.py:12
-#: .\templates\wagtailusers\edit.html.py:12
+#: .\templates\wagtailusers\create.html:12
+#: .\templates\wagtailusers\edit.html:12
 msgid "Account"
 msgstr "Λογαριασμός"
 
-#: .\templates\wagtailusers\create.html.py:13
-#: .\templates\wagtailusers\create.html.py:28
-#: .\templates\wagtailusers\edit.html.py:13
+#: .\templates\wagtailusers\create.html:13
+#: .\templates\wagtailusers\create.html:28
+#: .\templates\wagtailusers\edit.html:13
 msgid "Roles"
 msgstr "Ρόλοι"
 
-#: .\templates\wagtailusers\edit.html.py:4
-#: .\templates\wagtailusers\edit.html.py:8
+#: .\templates\wagtailusers\edit.html:4 .\templates\wagtailusers\edit.html:8
 msgid "Editing"
 msgstr "Διόρθωση"
 
-#: .\templates\wagtailusers\edit.html.py:37
+#: .\templates\wagtailusers\edit.html:30 .\templates\wagtailusers\edit.html:37
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: .\templates\wagtailusers\index.html.py:4
-#: .\templates\wagtailusers\index.html.py:17
+#: .\templates\wagtailusers\index.html:4
+#: .\templates\wagtailusers\index.html:17
 msgid "Users"
 msgstr "Χρήστες"
 
-#: .\templates\wagtailusers\index.html.py:18
+#: .\templates\wagtailusers\index.html:18
 msgid "Add a user"
 msgstr "Προσθήκη χρήστη"
 
-#: .\templates\wagtailusers\list.html.py:7
+#: .\templates\wagtailusers\list.html:7
 msgid "Name"
 msgstr "Όνομα"
 
-#: .\templates\wagtailusers\list.html.py:22
+#: .\templates\wagtailusers\list.html:22
 msgid "Level"
 msgstr "Επίπεδο"
 
-#: .\templates\wagtailusers\list.html.py:23
+#: .\templates\wagtailusers\list.html:23
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: .\templates\wagtailusers\list.html.py:36
+#: .\templates\wagtailusers\list.html:36
 msgid "Admin"
 msgstr "Διαχειριστής"
 
-#: .\templates\wagtailusers\list.html.py:37
+#: .\templates\wagtailusers\list.html:37
 msgid "Active"
 msgstr "Ενεργός"
 
-#: .\templates\wagtailusers\list.html.py:37
+#: .\templates\wagtailusers\list.html:37
 msgid "Inactive"
 msgstr "Μη ενεργός"
 
-#: .\templates\wagtailusers\results.html.py:12
+#: .\templates\wagtailusers\results.html:5
+#, python-format
+msgid ""
+"\n"
+"            There is one match\n"
+"        "
+msgid_plural ""
+"\n"
+"            There are %(counter)s matches\n"
+"        "
+msgstr[0] ""
+msgstr[1] ""
+
+#: .\templates\wagtailusers\results.html:18
 #, python-format
 msgid "Sorry, no users match \"<em>%(search_query)s</em>\""
 msgstr ""
 "Λυπούμαστε, δε βρέθηκαν χρήστες που να ταιριάζουν με το \"<em>%(search_query)"
 "s</em>\""
 
-#: .\templates\wagtailusers\results.html.py:15
+#: .\templates\wagtailusers\results.html:21
 #, python-format
 msgid ""
 "There are no users configured. Why not <a href=\"%(wagtailusers_create_url)s"
@@ -161,18 +175,16 @@ msgstr ""
 "\">προσθέσετε μερικούς</a>?"
 
 #: .\views\users.py:75
-#, python-format
-msgid "User '%s' created."
-msgstr "Ο χρήστης '%s' δημιουργήθηκε."
+msgid "User '{0}' created."
+msgstr "Ο χρήστης '{0}' δημιουργήθηκε."
 
 #: .\views\users.py:78
 msgid "The user could not be created due to errors."
 msgstr "Δεν ήταν δυνατή η δημιουργία του χρήστη."
 
 #: .\views\users.py:94
-#, python-format
-msgid "User '%s' updated."
-msgstr "Τα στοιχεία του χρήστη '%s' ενημερώθηκαν."
+msgid "User '{0}' updated."
+msgstr "Τα στοιχεία του χρήστη '{0}' ενημερώθηκαν."
 
 #: .\views\users.py:97
 msgid "The user could not be saved due to errors."
diff --git a/wagtail/wagtailusers/locale/en/LC_MESSAGES/django.mo b/wagtail/wagtailusers/locale/en/LC_MESSAGES/django.mo
index 86c691bb8c..4912a58680 100644
Binary files a/wagtail/wagtailusers/locale/en/LC_MESSAGES/django.mo and b/wagtail/wagtailusers/locale/en/LC_MESSAGES/django.mo differ
diff --git a/wagtail/wagtailusers/templates/wagtailusers/results.html b/wagtail/wagtailusers/templates/wagtailusers/results.html
index 54f8b14eea..21d9106b6c 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/results.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/results.html
@@ -1,7 +1,13 @@
 {% load i18n %}
 {% if users %}
     {% if is_searching %}
-        <h2>{{ users|length }} match{{ users|pluralize:"es" }}</h2>
+        <h2>
+        {% blocktrans count counter=users|length %}
+            There is one match
+        {% plural %}
+            There are {{ counter }} matches
+        {% endblocktrans %}
+        </h2>
     {% endif %}
 
     {% include "wagtailusers/list.html" %}