diff --git a/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.mo b/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.mo
index f8e310e4..1a1718b4 100644
Binary files a/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.mo and b/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.po b/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.po
index 750f7dc5..bb811f5a 100644
--- a/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.po
+++ b/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.po
@@ -63,10 +63,8 @@ msgstr "Panell de gestió"
#. Translators: This message appears on the page title
#: mixins.py:18 templates/musician/dashboard.html:89
#: templates/musician/dashboard.html:90 views.py:202
-#, fuzzy
-#| msgid "Domain"
msgid "Domains"
-msgstr "Domini"
+msgstr "Dominis"
#: mixins.py:19
msgid "Mails"
@@ -77,6 +75,9 @@ msgstr "Correus"
msgid "Databases"
msgstr "Bases de dades"
+msgid "Database"
+msgstr "Bases de dades"
+
#: mixins.py:22
msgid "SaaS"
msgstr "SaaS"
@@ -92,10 +93,8 @@ msgid "Webapps"
msgstr ""
#: mixins.py:25
-#, fuzzy
-#| msgid "Username"
msgid "Users"
-msgstr "Nom d’usuari/a"
+msgstr "Usuaris"
#: models.py:147
msgid "Description details for databases page."
@@ -327,14 +326,13 @@ msgstr "Mostrar historial"
#: templates/musician/webapps/webapp_list.html:25
#: templates/musician/websites/website_detail.html:77
#: templates/musician/websites/website_list.html:20
+#: templates/musician/mailinglist_list.html:24
msgid "Name"
msgstr "Nom"
#: templates/musician/database_list.html:23
-#, fuzzy
-#| msgid "Databases"
msgid "Database users"
-msgstr "Bases de dades"
+msgstr "Usuaris Base de dades"
#: templates/musician/database_list.html:24
#: templates/musician/domain_list.html:59
@@ -505,9 +503,8 @@ msgid "Change password"
msgstr "Canvia la contrasenya"
#: templates/musician/mailbox_check_delete.html:7
-#, python-format
-msgid "Are you sure that you want remove the mailbox: \"%(name)s\"?"
-msgstr "Estàs segur/a que vols esborrar la bústia de correu: \"%(name)s\"?"
+msgid "Are you sure that you want remove the mailbox:"
+msgstr "Estàs segur/a que vols esborrar la bústia de correu:"
#: templates/musician/mailbox_check_delete.html:9
msgid ""
@@ -551,20 +548,34 @@ msgid "New mailbox"
msgstr "Nova bústia de correu"
#: templates/musician/mailing_check_delete.html:7
-#, fuzzy, python-format
-#| msgid "Are you sure that you want remove the mailbox: \"%(name)s\"?"
-msgid "Are you sure that you want remove the list: \"%(list)s\"?"
-msgstr "Estàs segur/a que vols esborrar la bústia de correu: \"%(name)s\"?"
+msgid "Are you sure that you want remove the list:"
+msgstr "Estàs segur/a que vols esborrar la següent llista:"
#: templates/musician/mailinglist_form.html:20
msgid "Update list"
msgstr "Actualitzar llista"
#: templates/musician/mailinglist_form.html:22
-#, fuzzy
-#| msgid "Mail list"
msgid "Create list"
-msgstr "Llista de correu"
+msgstr "Crear llista"
+
+#: templates/musician/websites/website_list.html:23
+#: templates/musician/saas_list.html:20
+#: templates/musician/mailinglist_list.html:25
+msgid "Status"
+msgstr "Estat"
+
+#: templates/musician/mailinglist_list.html:26
+msgid "Address"
+msgstr "Direcció de correu"
+
+#: templates/musician/mailinglist_list.html:27
+msgid "Admin email"
+msgstr "Administrador"
+
+#: templates/musician/mailinglist_list.html:28
+msgid "Configure"
+msgstr "Configura"
#: templates/musician/mailinglist_list.html:37
msgid "Active"
@@ -603,10 +614,8 @@ msgid "Check your last bills"
msgstr "Consulta les teves darreres factures"
#: templates/musician/record_check_delete.html:7
-#, fuzzy
-#| msgid "Are you sure that you want remove the mailbox: \"%(name)s\"?"
-msgid "Are you sure that you want remove the following record\"?"
-msgstr "Estàs segur/a que vols esborrar la bústia de correu: \"%(name)s\"?"
+msgid "Are you sure that you want remove the following record?"
+msgstr "Estàs segur/a que vols esborrar el següent registre?"
#: templates/musician/record_form.html:8
msgid "Update record of"
@@ -616,18 +625,9 @@ msgstr "Actualitza la contrasenya a"
msgid "Add record to"
msgstr "Afegir registre a"
-#: templates/musician/saas_list.html:20
-#: templates/musician/websites/website_list.html:23
-#, fuzzy
-#| msgid "Inactive"
-msgid "Is active?"
-msgstr "Inactiu"
-
#: templates/musician/saas_list.html:21
-#, fuzzy
-#| msgid "Service info"
msgid "Service"
-msgstr "Informació del servei"
+msgstr "Servei"
#: templates/musician/saas_list.html:22
msgid "Service info"
@@ -744,10 +744,8 @@ msgstr "Afegir Opcio a"
#: templates/musician/webapps/webappoption_check_delete.html:7
#: templates/musician/websites/websiteoption_check_delete.html:7
-#, fuzzy
-#| msgid "Are you sure that you want remove the mailbox: \"%(name)s\"?"
-msgid "Are you sure that you want remove the following option\"?"
-msgstr "Estàs segur/a que vols esborrar la bústia de correu: \"%(name)s\"?"
+msgid "Are you sure that you want remove the following option?"
+msgstr "Estàs segur/a que vols esborrar la següent opció?"
#: templates/musician/websites/website_detail.html:7
msgid "WebSite Options for"
@@ -759,7 +757,7 @@ msgstr "Editar opcions"
#: templates/musician/websites/website_detail.html:40
msgid "Contents"
-msgstr ""
+msgstr "Contingut"
#: templates/musician/websites/website_detail.html:43
msgid "Webapps assigned to this website"
@@ -770,8 +768,6 @@ msgid "Webapp"
msgstr ""
#: templates/musician/websites/website_detail.html:48
-#, fuzzy
-#| msgid "Type"
msgid "Type "
msgstr "Tipus"
@@ -795,7 +791,7 @@ msgstr "Afegir nova directiva"
#: templates/musician/websites/website_form.html:19
msgid "Update Option of Website"
-msgstr ""
+msgstr "Actualitzar Opció de WebSite"
#: templates/musician/websites/website_list.html:21
msgid "Url"
@@ -811,7 +807,7 @@ msgstr ""
#: views.py:182
msgid "Account"
-msgstr ""
+msgstr "Compte"
#. Translators: This message appears on the page title
#: views.py:227
diff --git a/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.mo b/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.mo
index f200c41f..ee098fe3 100644
Binary files a/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.mo and b/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.mo differ
diff --git a/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.po b/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.po
index 20bcfe95..faf2d8ec 100644
--- a/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.po
+++ b/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.po
@@ -63,10 +63,9 @@ msgstr "Panel de gestión"
#. Translators: This message appears on the page title
#: mixins.py:18 templates/musician/dashboard.html:89
#: templates/musician/dashboard.html:90 views.py:202
-#, fuzzy
-#| msgid "Domain"
+#: templates/musician/websites/website_detail.html:17
msgid "Domains"
-msgstr "Dominio"
+msgstr "Dominios"
#: mixins.py:19
msgid "Mails"
@@ -77,6 +76,9 @@ msgstr "Correos"
msgid "Databases"
msgstr "Bases de datos"
+msgid "Database"
+msgstr "Bases de datos"
+
#: mixins.py:22
msgid "SaaS"
msgstr "SaaS"
@@ -92,10 +94,8 @@ msgid "Webapps"
msgstr ""
#: mixins.py:25
-#, fuzzy
-#| msgid "Username"
msgid "Users"
-msgstr "Nombre de usuario/a"
+msgstr "Usuarios"
#: models.py:147
msgid "Description details for databases page."
@@ -329,14 +329,13 @@ msgstr "Mostrar historial"
#: templates/musician/webapps/webapp_list.html:25
#: templates/musician/websites/website_detail.html:77
#: templates/musician/websites/website_list.html:20
+#: templates/musician/mailinglist_list.html:24
msgid "Name"
msgstr "Nombre"
#: templates/musician/database_list.html:23
-#, fuzzy
-#| msgid "Databases"
msgid "Database users"
-msgstr "Bases de datos"
+msgstr "Usuarios Base de datos"
#: templates/musician/database_list.html:24
#: templates/musician/domain_list.html:59
@@ -504,9 +503,8 @@ msgid "Change password"
msgstr "Cambia la contraseña"
#: templates/musician/mailbox_check_delete.html:7
-#, python-format
-msgid "Are you sure that you want remove the mailbox: \"%(name)s\"?"
-msgstr "¿Estás seguro/a de que quieres borrar el buzón de correo \"%(name)s\"?"
+msgid "Are you sure that you want remove the mailbox:"
+msgstr "¿Estás seguro/a de que quieres borrar el buzón de correo:"
#: templates/musician/mailbox_check_delete.html:9
msgid ""
@@ -550,22 +548,37 @@ msgid "New mailbox"
msgstr "Nuevo buzón de correo"
#: templates/musician/mailing_check_delete.html:7
-#, fuzzy, python-format
-#| msgid "Are you sure that you want remove the mailbox: \"%(name)s\"?"
-msgid "Are you sure that you want remove the list: \"%(list)s\"?"
-msgstr "¿Estás seguro/a de que quieres borrar el buzón de correo \"%(name)s\"?"
+msgid "Are you sure that you want remove the list:"
+msgstr "¿Estás seguro/a de que quieres borrar la siguiente lista:"
#: templates/musician/mailinglist_form.html:20
msgid "Update list"
msgstr "Actualizar lista"
#: templates/musician/mailinglist_form.html:22
-#, fuzzy
-#| msgid "Mail list"
msgid "Create list"
-msgstr "Lista de correo"
+msgstr "Crear lista"
+
+#: templates/musician/websites/website_list.html:23
+#: templates/musician/saas_list.html:20
+#: templates/musician/mailinglist_list.html:25
+msgid "Status"
+msgstr "Estado"
+
+#: templates/musician/mailinglist_list.html:26
+msgid "Address"
+msgstr "Dirección de correo"
+
+#: templates/musician/mailinglist_list.html:27
+msgid "Admin email"
+msgstr "Administrador"
+
+#: templates/musician/mailinglist_list.html:28
+msgid "Configure"
+msgstr "Configura"
#: templates/musician/mailinglist_list.html:37
+#: templates/musician/websites/website_detail.html:25
msgid "Active"
msgstr "Activo"
@@ -602,10 +615,8 @@ msgid "Check your last bills"
msgstr "Consulta tus últimas facturas"
#: templates/musician/record_check_delete.html:7
-#, fuzzy
-#| msgid "Are you sure that you want remove the mailbox: \"%(name)s\"?"
-msgid "Are you sure that you want remove the following record\"?"
-msgstr "¿Estás seguro/a de que quieres borrar el buzón de correo \"%(name)s\"?"
+msgid "Are you sure that you want remove the following record?"
+msgstr "¿Estás seguro/a de que quieres borrar el siguiente registro ?"
#: templates/musician/record_form.html:8
#, fuzzy
@@ -617,18 +628,10 @@ msgstr "Actualiza la contraseña"
msgid "Add record to"
msgstr "Agregar registro a"
-#: templates/musician/saas_list.html:20
-#: templates/musician/websites/website_list.html:23
-#, fuzzy
-#| msgid "Inactive"
-msgid "Is active?"
-msgstr "Inactivo"
#: templates/musician/saas_list.html:21
-#, fuzzy
-#| msgid "Service info"
msgid "Service"
-msgstr "Información del servicio"
+msgstr "Servicio"
#: templates/musician/saas_list.html:22
msgid "Service info"
@@ -740,6 +743,7 @@ msgstr "Usuario SFTP"
#: templates/musician/webapps/webapp_list.html:29
#: templates/musician/webapps/webappuser_list.html:17
#: templates/musician/websites/website_list.html:22
+#: templates/musician/websites/website_detail.html:13
msgid "Server"
msgstr "Servidor"
@@ -754,15 +758,18 @@ msgstr "Añadir Opción a"
#: templates/musician/webapps/webappoption_check_delete.html:7
#: templates/musician/websites/websiteoption_check_delete.html:7
-#, fuzzy
-#| msgid "Are you sure that you want remove the mailbox: \"%(name)s\"?"
-msgid "Are you sure that you want remove the following option\"?"
-msgstr "¿Estás seguro/a de que quieres borrar el buzón de correo \"%(name)s\"?"
+msgid "Are you sure that you want remove the following option?"
+msgstr "¿Estás seguro/a de que quieres borrar la siguiente opción?"
#: templates/musician/websites/website_detail.html:7
msgid "WebSite Options for"
msgstr "Opciones de Website para"
+
+#: templates/musician/websites/website_detail.html:32
+msgid "Protocol"
+msgstr "Protocolo"
+
#: templates/musician/websites/website_detail.html:37
msgid "Edit options"
msgstr "Editar opciones"
@@ -780,8 +787,6 @@ msgid "Webapp"
msgstr ""
#: templates/musician/websites/website_detail.html:48
-#, fuzzy
-#| msgid "Type"
msgid "Type "
msgstr "Tipo"
@@ -789,12 +794,6 @@ msgstr "Tipo"
msgid "Assigned new Webapp"
msgstr "Añadir nueva Webapp"
-#: templates/musician/websites/website_detail.html:70
-#, fuzzy
-#| msgid "Active"
-msgid "Directives"
-msgstr "Activo"
-
#: templates/musician/websites/website_detail.html:73
msgid "Options assigned to this Website"
msgstr "Opciones asignadas en este Website"
@@ -822,7 +821,7 @@ msgstr ""
#: views.py:182
msgid "Account"
-msgstr ""
+msgstr "Cuenta"
#. Translators: This message appears on the page title
#: views.py:227
@@ -900,8 +899,6 @@ msgstr ""
#. Translators: This message appears on the page title
#: websites/views.py:42
-#, fuzzy
-#| msgid "Type details"
msgid "website details"
msgstr "Detalles de cada tipo"
diff --git a/orchestra/contrib/musician/templates/musician/mailbox_check_delete.html b/orchestra/contrib/musician/templates/musician/mailbox_check_delete.html
index 18b92495..56c6b4e4 100644
--- a/orchestra/contrib/musician/templates/musician/mailbox_check_delete.html
+++ b/orchestra/contrib/musician/templates/musician/mailbox_check_delete.html
@@ -4,7 +4,7 @@
{% block content %}