diff --git a/core/admin/mailu/translations/es/LC_MESSAGES/messages.po b/core/admin/mailu/translations/es/LC_MESSAGES/messages.po
index e31d0359..74d57795 100644
--- a/core/admin/mailu/translations/es/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/es/LC_MESSAGES/messages.po
@@ -1,67 +1,48 @@
-# English translations for PROJECT.
-# Copyright (C) 2016 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-04-22 12:10+0200\n"
-"PO-Revision-Date: 2016-10-02 15:02+0200\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language: en\n"
-"Language-Team: en <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.3\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: Mailu\n"
+"Language: es\n"
 
 #: mailu/ui/forms.py:32
 msgid "Invalid email address."
-msgstr ""
+msgstr "Dirección de correo inválida."
 
 #: mailu/ui/forms.py:36
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmar"
 
 #: mailu/ui/forms.py:40 mailu/ui/forms.py:77
 msgid "E-mail"
-msgstr ""
+msgstr "Dirección de Correo"
 
 #: mailu/ui/forms.py:41 mailu/ui/forms.py:78 mailu/ui/forms.py:90
 #: mailu/ui/forms.py:109 mailu/ui/forms.py:162
 #: mailu/ui/templates/client.html:32 mailu/ui/templates/client.html:59
 msgid "Password"
-msgstr ""
+msgstr "Contraseña"
 
 #: mailu/ui/forms.py:42 mailu/ui/templates/login.html:4
 #: mailu/ui/templates/sidebar.html:111
 msgid "Sign in"
-msgstr ""
+msgstr "Entrar"
 
 #: mailu/ui/forms.py:46 mailu/ui/forms.py:56
 #: mailu/ui/templates/domain/details.html:27
 #: mailu/ui/templates/domain/list.html:18 mailu/ui/templates/relay/list.html:17
 msgid "Domain name"
-msgstr ""
+msgstr "Nmbre de dominio"
 
 #: mailu/ui/forms.py:47
 msgid "Maximum user count"
-msgstr ""
+msgstr "Máximo número de usuarios"
 
 #: mailu/ui/forms.py:48
 msgid "Maximum alias count"
-msgstr ""
-
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr ""
-
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr ""
+msgstr "Máximo número de aliases"
 
 #: mailu/ui/forms.py:51 mailu/ui/forms.py:72 mailu/ui/forms.py:83
 #: mailu/ui/forms.py:128 mailu/ui/forms.py:140
@@ -69,108 +50,74 @@ msgstr ""
 #: mailu/ui/templates/relay/list.html:19 mailu/ui/templates/token/list.html:19
 #: mailu/ui/templates/user/list.html:23
 msgid "Comment"
-msgstr ""
+msgstr "Comentario"
 
 #: mailu/ui/forms.py:52 mailu/ui/forms.py:61 mailu/ui/forms.py:66
 #: mailu/ui/forms.py:73 mailu/ui/forms.py:132 mailu/ui/forms.py:141
 msgid "Create"
-msgstr ""
-
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
-msgstr ""
-
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr ""
+msgstr "Crear"
 
 #: mailu/ui/forms.py:59 mailu/ui/forms.py:79 mailu/ui/forms.py:91
 msgid "Confirm password"
-msgstr ""
-
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr ""
-
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr ""
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr ""
+msgstr "Confirmar contraseña"
 
 #: mailu/ui/forms.py:80 mailu/ui/templates/user/list.html:22
 #: mailu/ui/templates/user/signup_domain.html:16
 msgid "Quota"
-msgstr ""
+msgstr "Cuota"
 
 #: mailu/ui/forms.py:81
 msgid "Allow IMAP access"
-msgstr ""
+msgstr "Permitir acceso IMAP"
 
 #: mailu/ui/forms.py:82
 msgid "Allow POP3 access"
-msgstr ""
-
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr ""
+msgstr "Permitir acceso POP3"
 
 #: mailu/ui/forms.py:85
 msgid "Save"
-msgstr ""
-
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr ""
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
-#: mailu/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr ""
+msgstr "Guardar"
 
 #: mailu/ui/forms.py:97
 msgid "Displayed name"
-msgstr ""
+msgstr "Nombre a mostrar"
 
 #: mailu/ui/forms.py:98
 msgid "Enable spam filter"
-msgstr ""
+msgstr "Habilitar filtro de spam"
 
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr ""
+#: mailu/ui/forms.py:80
+msgid "Spam filter threshold"
+msgstr "Límite del filtro de spam"
+
+#: mailu/ui/forms.py:105
+msgid "Save settings"
+msgstr "Guardar configuración"
+
+#: mailu/ui/forms.py:110
+msgid "Password check"
+msgstr "Revisar contraseña"
+
+#: mailu/ui/forms.py:111 mailu/ui/templates/sidebar.html:16
+msgid "Update password"
+msgstr "Actualizar contraseña"
 
 #: mailu/ui/forms.py:100
 msgid "Enable forwarding"
-msgstr ""
-
-#: mailu/ui/forms.py:101
-msgid "Keep a copy of the emails"
-msgstr ""
+msgstr "Habilitar reenvío"
 
 #: mailu/ui/forms.py:103 mailu/ui/forms.py:139
 #: mailu/ui/templates/alias/list.html:20
 msgid "Destination"
-msgstr ""
+msgstr "Destino"
 
-#: mailu/ui/forms.py:105
-msgid "Save settings"
-msgstr ""
-
-#: mailu/ui/forms.py:110
-msgid "Password check"
-msgstr ""
-
-#: mailu/ui/forms.py:111 mailu/ui/templates/sidebar.html:16
-msgid "Update password"
-msgstr ""
+#: mailu/ui/forms.py:120
+msgid "Update"
+msgstr "Actualizar"
 
 #: mailu/ui/forms.py:115
 msgid "Enable automatic reply"
-msgstr ""
+msgstr "Habilitar respuesta automática"
 
 #: mailu/ui/forms.py:116
 msgid "Reply subject"
@@ -180,29 +127,13 @@ msgstr ""
 msgid "Reply body"
 msgstr ""
 
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr ""
-
-#: mailu/ui/forms.py:120
-msgid "Update"
-msgstr ""
-
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr ""
-
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr ""
-
 #: mailu/ui/forms.py:136
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #: mailu/ui/forms.py:138
 msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
-msgstr ""
+msgstr "Usar sintaxis SQL (p.ej. para abarcar todos los alias)"
 
 #: mailu/ui/forms.py:145
 msgid "Admin email"
@@ -218,7 +149,7 @@ msgstr ""
 
 #: mailu/ui/forms.py:155
 msgid "Protocol"
-msgstr ""
+msgstr "Protocolo"
 
 #: mailu/ui/forms.py:158
 msgid "Hostname or IP"
@@ -227,182 +158,125 @@ msgstr ""
 #: mailu/ui/forms.py:159 mailu/ui/templates/client.html:20
 #: mailu/ui/templates/client.html:47
 msgid "TCP port"
-msgstr ""
+msgstr "Puerto TCP"
 
 #: mailu/ui/forms.py:160
 msgid "Enable TLS"
-msgstr ""
+msgstr "Habilitar TLS"
 
 #: mailu/ui/forms.py:161 mailu/ui/templates/client.html:28
 #: mailu/ui/templates/client.html:55 mailu/ui/templates/fetch/list.html:20
 msgid "Username"
-msgstr ""
-
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
-msgstr ""
-
-#: mailu/ui/forms.py:168
-msgid "Announcement subject"
-msgstr ""
-
-#: mailu/ui/forms.py:170
-msgid "Announcement body"
-msgstr ""
-
-#: mailu/ui/forms.py:172
-msgid "Send"
-msgstr ""
-
-#: mailu/ui/templates/announcement.html:4
-msgid "Public announcement"
-msgstr ""
-
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
-msgstr ""
-
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
-msgid "Mail protocol"
-msgstr ""
-
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
-msgid "Server name"
-msgstr ""
+msgstr "Nombre de usuario"
 
 #: mailu/ui/templates/confirm.html:4
 msgid "Confirm action"
-msgstr ""
+msgstr "Confirmar acción"
 
 #: mailu/ui/templates/confirm.html:13
-#, python-format
 msgid "You are about to %(action)s. Please confirm your action."
 msgstr ""
 
 #: mailu/ui/templates/docker-error.html:4
 msgid "Docker error"
-msgstr ""
+msgstr "Error de Docker"
 
 #: mailu/ui/templates/docker-error.html:12
 msgid "An error occurred while talking to the Docker server."
+msgstr "Ocurrió un error en la comunicación con el servidor Docker."
+
+#: mailu/admin/templates/login.html:6
+msgid "Your account"
 msgstr ""
 
 #: mailu/ui/templates/login.html:8
 msgid "to access the administration tools"
-msgstr ""
+msgstr "para acceder a las herramientas de administración"
 
 #: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
 msgid "Services status"
-msgstr ""
+msgstr "Estado de servicios"
 
 #: mailu/ui/templates/services.html:10
 msgid "Service"
-msgstr ""
+msgstr "Servicio"
 
 #: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #: mailu/ui/templates/services.html:12
 msgid "PID"
-msgstr ""
+msgstr "PID"
 
 #: mailu/ui/templates/services.html:13
 msgid "Image"
-msgstr ""
+msgstr "Imagen"
 
 #: mailu/ui/templates/services.html:14
 msgid "Started"
-msgstr ""
+msgstr "Iniciado"
 
 #: mailu/ui/templates/services.html:15
 msgid "Last update"
-msgstr ""
+msgstr "Última actualización"
 
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
-msgstr ""
+msgstr "Mi cuenta"
 
 #: mailu/ui/templates/sidebar.html:11 mailu/ui/templates/user/list.html:34
 msgid "Settings"
-msgstr ""
+msgstr "Configuración"
+
+#: mailu/ui/templates/user/settings.html:22
+msgid "Auto-forward"
+msgstr "Auto-reenvío"
 
 #: mailu/ui/templates/sidebar.html:21 mailu/ui/templates/user/list.html:35
 msgid "Auto-reply"
-msgstr ""
+msgstr "Auto-respuesta"
 
 #: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:26
 #: mailu/ui/templates/user/list.html:36
 msgid "Fetched accounts"
 msgstr ""
 
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr ""
+#: mailu/ui/templates/sidebar.html:105
+msgid "Sign out"
+msgstr "Salir"
 
 #: mailu/ui/templates/sidebar.html:35
 msgid "Administration"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:44
-msgid "Announcement"
-msgstr ""
+msgstr "Administración"
 
 #: mailu/ui/templates/sidebar.html:49
 msgid "Administrators"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:54
-msgid "Relayed domains"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr ""
+msgstr "Administradores"
 
 #: mailu/ui/templates/sidebar.html:66
 msgid "Mail domains"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:76
-msgid "Webmail"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr ""
+msgstr "Dominios de correo"
 
 #: mailu/ui/templates/sidebar.html:92
 msgid "Help"
-msgstr ""
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:105
-msgid "Sign out"
-msgstr ""
+msgstr "Ayuda"
 
 #: mailu/ui/templates/working.html:4
 msgid "We are still working on this feature!"
-msgstr ""
+msgstr "Aún trabajamos en esta característica!"
 
 #: mailu/ui/templates/admin/create.html:4
 msgid "Add a global administrator"
-msgstr ""
+msgstr "Añadir administrador global"
 
 #: mailu/ui/templates/admin/list.html:4
 msgid "Global administrators"
-msgstr ""
+msgstr "Administradores globales"
 
 #: mailu/ui/templates/admin/list.html:9
 msgid "Add administrator"
-msgstr ""
+msgstr "Añadr administrador"
 
 #: mailu/ui/templates/admin/list.html:16 mailu/ui/templates/alias/list.html:18
 #: mailu/ui/templates/alternative/list.html:18
@@ -411,12 +285,12 @@ msgstr ""
 #: mailu/ui/templates/relay/list.html:16 mailu/ui/templates/token/list.html:18
 #: mailu/ui/templates/user/list.html:18
 msgid "Actions"
-msgstr ""
+msgstr "Acciones"
 
 #: mailu/ui/templates/admin/list.html:17 mailu/ui/templates/alias/list.html:19
 #: mailu/ui/templates/manager/list.html:19 mailu/ui/templates/user/list.html:20
 msgid "Email"
-msgstr ""
+msgstr "Correo"
 
 #: mailu/ui/templates/admin/list.html:22 mailu/ui/templates/alias/list.html:29
 #: mailu/ui/templates/alternative/list.html:25
@@ -425,23 +299,23 @@ msgstr ""
 #: mailu/ui/templates/relay/list.html:27 mailu/ui/templates/token/list.html:26
 #: mailu/ui/templates/user/list.html:31
 msgid "Delete"
-msgstr ""
+msgstr "Eliminar"
 
 #: mailu/ui/templates/alias/create.html:4
 msgid "Create alias"
-msgstr ""
+msgstr "Crear alias"
 
 #: mailu/ui/templates/alias/edit.html:4
 msgid "Edit alias"
-msgstr ""
+msgstr "Editar alias"
 
 #: mailu/ui/templates/alias/list.html:4
 msgid "Alias list"
-msgstr ""
+msgstr "Lista de alias"
 
 #: mailu/ui/templates/alias/list.html:12
 msgid "Add alias"
-msgstr ""
+msgstr "Añadir alias"
 
 #: mailu/ui/templates/alias/list.html:22
 #: mailu/ui/templates/alternative/list.html:20
@@ -449,52 +323,32 @@ msgstr ""
 #: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:21
 #: mailu/ui/templates/user/list.html:24
 msgid "Created"
-msgstr ""
+msgstr "Creado"
 
 #: mailu/ui/templates/alias/list.html:23 mailu/ui/templates/domain/list.html:23
 #: mailu/ui/templates/fetch/list.html:25 mailu/ui/templates/relay/list.html:21
 #: mailu/ui/templates/user/list.html:25
 msgid "Last edit"
-msgstr ""
+msgstr "Última edición"
 
 #: mailu/ui/templates/alias/list.html:28 mailu/ui/templates/domain/list.html:30
 #: mailu/ui/templates/fetch/list.html:30 mailu/ui/templates/relay/list.html:26
 #: mailu/ui/templates/user/list.html:30
 msgid "Edit"
-msgstr ""
-
-#: mailu/ui/templates/alternative/create.html:4
-msgid "Create alternative domain"
-msgstr ""
-
-#: mailu/ui/templates/alternative/list.html:4
-msgid "Alternative domain list"
-msgstr ""
-
-#: mailu/ui/templates/alternative/list.html:12
-msgid "Add alternative"
-msgstr ""
-
-#: mailu/ui/templates/alternative/list.html:19
-msgid "Name"
-msgstr ""
+msgstr "Editar"
 
 #: mailu/ui/templates/domain/create.html:4
 #: mailu/ui/templates/domain/list.html:9
 msgid "New domain"
-msgstr ""
+msgstr "Nuevo dominio"
 
 #: mailu/ui/templates/domain/details.html:4
 msgid "Domain details"
-msgstr ""
+msgstr "Detalle del domino"
 
 #: mailu/ui/templates/domain/details.html:15
 msgid "Regenerate keys"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr ""
+msgstr "Regenerar llaves"
 
 #: mailu/ui/templates/domain/details.html:31
 msgid "DNS MX entry"
@@ -518,11 +372,11 @@ msgstr ""
 
 #: mailu/ui/templates/domain/edit.html:4
 msgid "Edit domain"
-msgstr ""
+msgstr "Editar domino"
 
 #: mailu/ui/templates/domain/list.html:4
 msgid "Domain list"
-msgstr ""
+msgstr "Lista de dominios"
 
 #: mailu/ui/templates/domain/list.html:17
 msgid "Manage"
@@ -538,41 +392,20 @@ msgstr ""
 
 #: mailu/ui/templates/domain/list.html:28
 msgid "Details"
-msgstr ""
+msgstr "Detalles"
 
 #: mailu/ui/templates/domain/list.html:35
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #: mailu/ui/templates/domain/list.html:36
 msgid "Aliases"
-msgstr ""
+msgstr "Alias"
 
 #: mailu/ui/templates/domain/list.html:37
 msgid "Managers"
 msgstr ""
 
-#: mailu/ui/templates/domain/list.html:39
-msgid "Alternatives"
-msgstr ""
-
-#: mailu/ui/templates/domain/signup.html:13
-msgid ""
-"In order to register a new domain, you must first setup the\n"
-"    domain zone so that the domain <code>MX</code> points to this server"
-msgstr ""
-
-#: mailu/ui/templates/domain/signup.html:18
-msgid ""
-"If you do not know how to setup an <code>MX</code> record for your DNS "
-"zone,\n"
-"    please contact your DNS provider or administrator. Also, please wait "
-"a\n"
-"    couple minutes after the <code>MX</code> is set so the local server "
-"cache\n"
-"    expires."
-msgstr ""
-
 #: mailu/ui/templates/fetch/create.html:4
 msgid "Add a fetched account"
 msgstr ""
@@ -583,27 +416,15 @@ msgstr ""
 
 #: mailu/ui/templates/fetch/list.html:12
 msgid "Add an account"
-msgstr ""
+msgstr "Añadir una cuenta"
 
 #: mailu/ui/templates/fetch/list.html:19
 msgid "Endpoint"
 msgstr ""
 
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr ""
-
 #: mailu/ui/templates/fetch/list.html:22
 msgid "Last check"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr ""
+msgstr "Último checkeo"
 
 #: mailu/ui/templates/manager/create.html:4
 msgid "Add a manager"
@@ -617,6 +438,126 @@ msgstr ""
 msgid "Add manager"
 msgstr ""
 
+#: mailu/ui/forms.py:168
+msgid "Announcement subject"
+msgstr ""
+
+#: mailu/ui/forms.py:170
+msgid "Announcement body"
+msgstr ""
+
+#: mailu/ui/forms.py:172
+msgid "Send"
+msgstr "Enviar"
+
+#: mailu/ui/templates/announcement.html:4
+msgid "Public announcement"
+msgstr "Anuncio público"
+
+#: mailu/ui/templates/announcement.html:8
+msgid "from"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:44
+msgid "Announcement"
+msgstr "Anuncio"
+
+#: mailu/ui/templates/user/create.html:4
+msgid "New user"
+msgstr "Nuevo usuario"
+
+#: mailu/ui/templates/user/edit.html:4
+msgid "Edit user"
+msgstr "Editar usuario"
+
+#: mailu/ui/templates/user/forward.html:4
+msgid "Forward emails"
+msgstr ""
+
+#: mailu/ui/templates/user/list.html:4
+msgid "User list"
+msgstr "Lista de usuarios"
+
+#: mailu/ui/templates/user/list.html:12
+msgid "Add user"
+msgstr "Añadir usuario"
+
+#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
+msgid "User settings"
+msgstr "Configuración de usuario"
+
+#: mailu/ui/templates/user/list.html:21
+msgid "Features"
+msgstr "Características"
+
+#: mailu/ui/templates/user/password.html:4
+msgid "Password update"
+msgstr "Actualizar contraseña"
+
+#: mailu/ui/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr "Respuesta automática"
+
+#: mailu/ui/forms.py:49
+msgid "Maximum user quota"
+msgstr ""
+
+#: mailu/ui/forms.py:101
+msgid "Keep a copy of the emails"
+msgstr "Mantener una copia de los correos"
+
+#: mailu/ui/forms.py:163
+msgid "Keep emails on the server"
+msgstr "Mantener los correos en el servidor"
+
+#: mailu/ui/templates/fetch/list.html:21
+msgid "Keep emails"
+msgstr "Mantener los correos"
+
+#: mailu/ui/templates/fetch/list.html:35
+msgid "yes"
+msgstr "si"
+
+#: mailu/ui/templates/fetch/list.html:35
+msgid "no"
+msgstr "no"
+
+#: mailu/ui/forms.py:65
+msgid "Alternative name"
+msgstr ""
+
+#: mailu/ui/forms.py:70
+msgid "Relayed domain name"
+msgstr ""
+
+#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
+msgid "Remote host"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:54
+msgid "Relayed domains"
+msgstr ""
+
+#: mailu/ui/templates/alternative/create.html:4
+msgid "Create alternative domain"
+msgstr ""
+
+#: mailu/ui/templates/alternative/list.html:4
+msgid "Alternative domain list"
+msgstr ""
+
+#: mailu/ui/templates/alternative/list.html:12
+msgid "Add alternative"
+msgstr ""
+
+#: mailu/ui/templates/alternative/list.html:19
+msgid "Name"
+msgstr "Nombre"
+
+#: mailu/ui/templates/domain/list.html:39
+msgid "Alternatives"
+msgstr ""
+
 #: mailu/ui/templates/relay/create.html:4
 msgid "New relay domain"
 msgstr ""
@@ -633,6 +574,30 @@ msgstr ""
 msgid "New relayed domain"
 msgstr ""
 
+#: mailu/ui/forms.py:125
+msgid "Your token (write it down, as it will never be displayed again)"
+msgstr ""
+
+#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
+msgid "Authorized IP"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
+msgid "Authentication tokens"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:72
+msgid "Go to"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:76
+msgid "Webmail"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:87
+msgid "Website"
+msgstr ""
+
 #: mailu/ui/templates/token/create.html:4
 msgid "Create an authentication token"
 msgstr ""
@@ -641,10 +606,6 @@ msgstr ""
 msgid "New token"
 msgstr ""
 
-#: mailu/ui/templates/user/create.html:4
-msgid "New user"
-msgstr ""
-
 #: mailu/ui/templates/user/create.html:15
 msgid "General"
 msgstr ""
@@ -653,40 +614,78 @@ msgstr ""
 msgid "Features and quotas"
 msgstr ""
 
-#: mailu/ui/templates/user/edit.html:4
-msgid "Edit user"
+#: mailu/ui/templates/user/settings.html:14
+msgid "General settings"
 msgstr ""
 
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
+#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
+msgid "Antispam"
 msgstr ""
 
-#: mailu/ui/templates/user/list.html:4
-msgid "User list"
+#: mailu/ui/forms.py:99
+msgid "Spam filter tolerance"
 msgstr ""
 
-#: mailu/ui/templates/user/list.html:12
-msgid "Add user"
+#: mailu/ui/forms.py:50
+msgid "Enable sign-up"
 msgstr ""
 
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
-msgid "User settings"
+#: mailu/ui/forms.py:57
+msgid "Initial admin"
 msgstr ""
 
-#: mailu/ui/templates/user/list.html:21
-msgid "Features"
+#: mailu/ui/forms.py:58
+msgid "Admin password"
 msgstr ""
 
-#: mailu/ui/templates/user/password.html:4
-msgid "Password update"
+#: mailu/ui/forms.py:84
+msgid "Enabled"
 msgstr ""
 
-#: mailu/ui/templates/user/reply.html:4
-msgid "Automatic reply"
+#: mailu/ui/forms.py:89
+msgid "Email address"
 msgstr ""
 
-#: mailu/ui/templates/user/settings.html:22
-msgid "Auto-forward"
+#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
+#: mailu/ui/templates/user/signup.html:4
+#: mailu/ui/templates/user/signup_domain.html:4
+msgid "Sign up"
+msgstr ""
+
+#: mailu/ui/forms.py:119
+msgid "End of vacation"
+msgstr ""
+
+#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
+msgid "Client setup"
+msgstr ""
+
+#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
+msgid "Mail protocol"
+msgstr ""
+
+#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
+msgid "Server name"
+msgstr ""
+
+#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
+msgid "Register a domain"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:17
+msgid "Generate keys"
+msgstr ""
+
+#: mailu/ui/templates/domain/signup.html:13
+msgid "In order to register a new domain, you must first setup the\n"
+"    domain zone so that the domain <code>MX</code> points to this server"
+msgstr ""
+
+#: mailu/ui/templates/domain/signup.html:18
+msgid "If you do not know how to setup an <code>MX</code> record for your DNS zone,\n"
+"    please contact your DNS provider or administrator. Also, please wait a\n"
+"    couple minutes after the <code>MX</code> is set so the local server cache\n"
+"    expires."
 msgstr ""
 
 #: mailu/ui/templates/user/signup_domain.html:8
@@ -701,15 +700,3 @@ msgstr ""
 msgid "Available slots"
 msgstr ""
 
-#~ msgid "Your account"
-#~ msgstr ""
-
-#~ msgid "Spam filter threshold"
-#~ msgstr ""
-
-#~ msgid "from"
-#~ msgstr ""
-
-#~ msgid "General settings"
-#~ msgstr ""
-