[I18N] Update translation terms from Transifex

1 files changed, 1031 insertions, 1294 deletions

diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po
index bf6047b4bd1..a57acc864cd 100644
--- a/addons/mail/i18n/es.po
+++ b/addons/mail/i18n/es.po
@@ -13,9 +13,9 @@
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
-# David Perez <david@closemarketing.es>, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
+# David Perez <david@closemarketing.es>, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Daniel Santibáñez Polanco <dansanti@gmail.com>, 2016
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
@@ -40,13 +40,15 @@
 # e2f <projects@e2f.com>, 2018
 # Paloma Yazmin Reyes Morales <paloma.reyes@jarsa.com.mx>, 2018
 # e2f_EPV Translator <e2f_EPV@outlook.com>, 2018
+# ES R1 <e2fes@hotmail.com>, 2018
+# Nicolás Broggi <rnbroggi@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
-"Last-Translator: e2f_EPV Translator <e2f_EPV@outlook.com>, 2018\n"
+"POT-Creation-Date: 2018-08-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"Last-Translator: Nicolás Broggi <rnbroggi@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,67 +57,52 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:680
+#: code:addons/mail/models/mail_channel.py:888
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr "El canal es privado. Hay que tener una invitación para unirse."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1634
+#: code:addons/mail/static/src/js/services/chat_manager.js:1879
 #, python-format
 msgid "%d Messages"
 msgstr "%d mensajes"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:88
+#: code:addons/mail/static/src/js/activity.js:89
 #, python-format
 msgid "%d days overdue"
 msgstr "%d días de retraso"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:279
+#: code:addons/mail/models/mail_template.py:249
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:261
 #, python-format
 msgid "%s created"
 msgstr "%s creado"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:80
-#, python-format
-msgid "%s has joined the %s network."
-msgstr "%s se ha unido a la red %s."
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:225
 #, python-format
 msgid "&nbsp;("
 msgstr "&nbsp;("
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:184
+#: code:addons/mail/static/src/xml/thread.xml:174
 #, python-format
 msgid "(from"
 msgstr "(de"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode__shortcode_type
-msgid ""
-"* Smiley are only used for HTML code to display an image * Text (default "
-"value) is used to substitute text with another text"
-msgstr ""
-"* Smiley solo es usado por el código HTML para mostrar una imagen * Texto "
-"(valor por defecto) es usado para substituir el texto por otro texto"
-
-#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:49
 #, python-format
@@ -124,7 +111,7 @@ msgstr ", vencido a fecha"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:336
+#: code:addons/mail/static/src/xml/thread.xml:364
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr "-------- Mostrar mensajes antiguos--------"
@@ -151,7 +138,21 @@ msgid "0 Today"
 msgstr "0 hoy"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:684
+#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
+msgid ""
+"<?xml version=\"1.0\"?>\n"
+"<div>\n"
+"<p>Hello ${object.name or ''},</p>\n"
+"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
+"<p>\n"
+"${ctx['channel'].moderation_guidelines_msg}\n"
+"</p>\n"
+"<p/>\n"
+"</div>\n"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:892
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -167,7 +168,7 @@ msgstr ""
 "            Puedes insertar respuestas enlatadas tecleando <b>:shortcut</b>.<br>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:507
+#: code:addons/mail/models/mail_channel.py:712
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -176,7 +177,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:590
+#: code:addons/mail/models/mail_channel.py:798
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -186,8 +187,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:514
-#: code:addons/mail/models/mail_channel.py:567
+#: code:addons/mail/models/mail_channel.py:719
+#: code:addons/mail/models/mail_channel.py:772
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -197,7 +198,7 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:182
+#: code:addons/mail/models/mail_channel.py:292
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">left <a href=\"#\" "
@@ -296,6 +297,13 @@ msgstr ""
 "                                </span>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid ""
+"<span class=\"fa fa-info-circle\"/> Caution: It won't be possible to send "
+"this mail again to the recipients you did not select."
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid ""
 "<span class=\"o_stat_text\">Add</span>\n"
@@ -315,7 +323,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
-msgid "<span class=\"oe_inline\">days</span>"
+msgid "<span class=\"oe_inline ml4\">days</span>"
 msgstr ""
 
 #. module: mail
@@ -380,80 +388,52 @@ msgstr ""
 "transformara en \"Buenos días\"."
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:148
+#: code:addons/mail/static/src/xml/thread.xml:251
+#, python-format
+msgid "Accept"
+msgstr "Aceptar"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:148
+#, python-format
+msgid "Accept selected messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:251
+#, python-format
+msgid "Accept |"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,moderation_status:0
+#: selection:mail.message,moderation_status:0
+msgid "Accepted"
+msgstr "Aceptada"
+
+#. module: mail
 #: model:ir.model,name:mail.model_res_groups
 msgid "Access Groups"
 msgstr "Grupos de acceso"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction
 #: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction
-#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
 #: model:ir.model.fields,field_description:mail.field_res_users__message_needaction
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction
 msgid "Action Needed"
 msgstr "Acción Necesaria"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__state
+msgid "Action To Do"
+msgstr "Acción a realizar"
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_message_subtype__default
 msgid "Activated by default when subscribing."
 msgstr "Activado por defecto en la suscripción."
@@ -466,35 +446,15 @@ msgstr "Activo"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__active_domain
 msgid "Active domain"
 msgstr "Dominio activo"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/systray.xml:87
-#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_ids
-#: model:ir.model.fields,field_description:mail.field_event_track__activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_ids
 #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_ids
-#: model:ir.model.fields,field_description:mail.field_note_note__activity_ids
-#: model:ir.model.fields,field_description:mail.field_product_product__activity_ids
-#: model:ir.model.fields,field_description:mail.field_product_template__activity_ids
-#: model:ir.model.fields,field_description:mail.field_project_task__activity_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_ids
-#: model:ir.model.fields,field_description:mail.field_repair_order__activity_ids
 #: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
 #: model:ir.model.fields,field_description:mail.field_res_users__activity_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order__activity_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_ids
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
@@ -522,28 +482,9 @@ msgid "Activity Mixin"
 msgstr "Mezcla de actividades"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_state
-#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_state
-#: model:ir.model.fields,field_description:mail.field_event_track__activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_state
 #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_state
-#: model:ir.model.fields,field_description:mail.field_note_note__activity_state
-#: model:ir.model.fields,field_description:mail.field_product_product__activity_state
-#: model:ir.model.fields,field_description:mail.field_product_template__activity_state
-#: model:ir.model.fields,field_description:mail.field_project_task__activity_state
-#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_state
-#: model:ir.model.fields,field_description:mail.field_repair_order__activity_state
 #: model:ir.model.fields,field_description:mail.field_res_partner__activity_state
 #: model:ir.model.fields,field_description:mail.field_res_users__activity_state
-#: model:ir.model.fields,field_description:mail.field_sale_order__activity_state
-#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_state
-#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_state
 msgid "Activity State"
 msgstr "Estado de la actividad"
 
@@ -569,7 +510,7 @@ msgstr "Tipo de actividad"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:87
+#: code:addons/mail/static/src/xml/discuss.xml:93
 #, python-format
 msgid "Add"
 msgstr "Añadir"
@@ -585,6 +526,7 @@ msgstr "Añadir canales"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:61
+#: selection:ir.actions.server,state:0
 #: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
@@ -600,6 +542,13 @@ msgstr ""
 "electrónico"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__add_sign
+#: model:ir.model.fields,field_description:mail.field_mail_mail__add_sign
+#: model:ir.model.fields,field_description:mail.field_mail_message__add_sign
+msgid "Add Sign"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
 #: model:ir.model.fields,field_description:mail.field_mail_template__user_signature
 msgid "Add Signature"
@@ -607,21 +556,21 @@ msgstr "Añadir firma"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:41
-#: code:addons/mail/static/src/xml/discuss.xml:186
+#: code:addons/mail/static/src/xml/discuss.xml:47
+#: code:addons/mail/static/src/xml/discuss.xml:200
 #, python-format
 msgid "Add a channel"
 msgstr "Añadir un canal"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:335
+#: code:addons/mail/models/mail_thread.py:362
 #, python-format
 msgid "Add a new %(document)s or send an email to %(email_link)s"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:60
+#: code:addons/mail/static/src/xml/discuss.xml:66
 #, python-format
 msgid "Add a private channel"
 msgstr "Añadir un canal privado"
@@ -638,6 +587,13 @@ msgid "Add contacts to notify..."
 msgstr "Añadir contactos a notificar..."
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:257
+#, python-format
+msgid "Add this email address to white list of people"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
 msgid "Additional Contacts"
 msgstr "Contactos adicionales"
@@ -710,13 +666,31 @@ msgid "All"
 msgstr "Todos"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Allowed Emails"
+msgstr ""
+
+#. module: mail
 #: selection:ir.model.fields,track_visibility:0
 msgid "Always"
 msgstr "Siempre"
 
 #. module: mail
+#: selection:mail.moderation,status:0
+msgid "Always Allow"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:257
+#, python-format
+msgid "Always Allow |"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1328
+#: code:addons/mail/models/mail_channel.py:891
+#: code:addons/mail/static/src/js/services/chat_manager.js:1486
 #, python-format
 msgid "Anonymous"
 msgstr "Anónimo"
@@ -725,7 +699,6 @@ msgstr "Anónimo"
 #: model:ir.model.fields,help:mail.field_mail_compose_message__no_auto_thread
 #: model:ir.model.fields,help:mail.field_mail_mail__no_auto_thread
 #: model:ir.model.fields,help:mail.field_mail_message__no_auto_thread
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__no_auto_thread
 msgid ""
 "Answers do not go in the original document discussion thread. This has an "
 "impact on the generated message-id."
@@ -752,6 +725,14 @@ msgid "Archived"
 msgstr "Archivada"
 
 #. module: mail
+#: code:addons/mail/wizard/mail_resend_message.py:96
+#, python-format
+msgid ""
+"Are you sure you want to discard %s mail delivery failures. You won't be "
+"able to re-send these mails later!"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:45
 #: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
@@ -760,6 +741,15 @@ msgid "Assigned to"
 msgstr "Asignada a"
 
 #. module: mail
+#: code:addons/mail/models/mail_activity.py:198
+#: code:addons/mail/models/mail_activity.py:205
+#, python-format
+msgid ""
+"Assigned user %s has no access to the document and is not able to handle "
+"this activity."
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
@@ -799,7 +789,6 @@ msgstr "Empresas autenticadas"
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_id
 #: model:ir.model.fields,field_description:mail.field_mail_mail__author_id
 #: model:ir.model.fields,field_description:mail.field_mail_message__author_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_id
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Author"
 msgstr "Autor"
@@ -813,7 +802,6 @@ msgstr "Firma del autor (sólo para envíos masivos)"
 #: model:ir.model.fields,help:mail.field_mail_compose_message__author_id
 #: model:ir.model.fields,help:mail.field_mail_mail__author_id
 #: model:ir.model.fields,help:mail.field_mail_message__author_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_id
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that"
 " did not match any partner."
@@ -825,7 +813,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_avatar
 #: model:ir.model.fields,field_description:mail.field_mail_mail__author_avatar
 #: model:ir.model.fields,field_description:mail.field_mail_message__author_avatar
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_avatar
 msgid "Author's avatar"
 msgstr "Avatar del autor"
 
@@ -852,12 +839,46 @@ msgid "Auto subscription"
 msgstr "Auto suscripción"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__automated
+msgid "Automated activity"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_notify
+msgid "Automatic notification"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
 msgid "Available for mass mailing"
 msgstr "Disponible para envío masivo de correo"
 
 #. module: mail
 #. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:259
+#, python-format
+msgid "Ban"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Ban List"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:259
+#, python-format
+msgid "Ban this email address"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Banned Emails"
+msgstr ""
+
+#. module: mail
+#. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:89
 #, python-format
 msgid "Be careful with channels following internal notifications"
@@ -892,6 +913,8 @@ msgstr "Llamada"
 #: code:addons/mail/static/src/js/followers.js:341
 #: code:addons/mail/static/src/xml/activity.xml:65
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
@@ -904,14 +927,19 @@ msgid "Cancel Email"
 msgstr "Cancelar correo electrónico"
 
 #. module: mail
-#: selection:mail.mail,state:0
-msgid "Cancelled"
+#: model:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid "Cancel notification in failure"
+msgstr ""
+
+#. module: mail
+#: selection:mail.notification,email_status:0
+msgid "Canceled"
 msgstr "Cancelado"
 
 #. module: mail
-#: selection:mail.shortcode,shortcode_type:0
-msgid "Canned Response"
-msgstr "Respuesta preparada"
+#: selection:mail.mail,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_shortcode
@@ -932,6 +960,11 @@ msgstr ""
 "campos)"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_company__catchall
+msgid "Catchall Email"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_activity__activity_category
 #: model:ir.model.fields,help:mail.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
@@ -964,6 +997,7 @@ msgstr "Campo cambiado"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__channel_id
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
 #: selection:mail.channel,channel_type:0
 msgid "Channel"
@@ -980,9 +1014,21 @@ msgid "Channel Type"
 msgstr "Tipo de canal"
 
 #. module: mail
+#: model:ir.model,name:mail.model_mail_moderation
+msgid "Channel black/white list"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:36
-#: code:addons/mail/static/src/xml/discuss.xml:172
+#: code:addons/mail/static/src/xml/discuss.xml:117
+#, python-format
+msgid "Channel settings"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:42
+#: code:addons/mail/static/src/xml/discuss.xml:186
 #: code:addons/mail/static/src/xml/systray.xml:19
 #: code:addons/mail/static/src/xml/systray.xml:36
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__channel_ids
@@ -991,7 +1037,6 @@ msgstr "Tipo de canal"
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__channel_ids
 #: model:ir.model.fields,field_description:mail.field_res_partner__channel_ids
 #: model:ir.model.fields,field_description:mail.field_res_users__channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__channel_ids
 #: model:ir.ui.menu,name:mail.mail_channel_menu_settings
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
 #, python-format
@@ -1006,7 +1051,7 @@ msgstr "Canales/socios"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:168
+#: code:addons/mail/static/src/xml/discuss.xml:182
 #: code:addons/mail/static/src/xml/systray.xml:18
 #: code:addons/mail/static/src/xml/systray.xml:32
 #: model:ir.actions.client,name:mail.mail_channel_action_client_chat
@@ -1028,7 +1073,6 @@ msgstr "Código corto de chat"
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__child_ids
 #: model:ir.model.fields,field_description:mail.field_mail_mail__child_ids
 #: model:ir.model.fields,field_description:mail.field_mail_message__child_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__child_ids
 msgid "Child Messages"
 msgstr "Mensajes hijos"
 
@@ -1076,11 +1120,15 @@ msgstr ""
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 #: selection:mail.compose.message,message_type:0
 #: selection:mail.message,message_type:0
-#: selection:survey.mail.compose.message,message_type:0
 msgid "Comment"
 msgstr "Comentario"
 
 #. module: mail
+#: model:ir.model,name:mail.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid "Compose Email"
@@ -1088,7 +1136,6 @@ msgstr "Componer correo electrónico"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__composition_mode
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__composition_mode
 msgid "Composition mode"
 msgstr "Modo de composición"
 
@@ -1099,14 +1146,14 @@ msgstr "Configurar sus tipos de actividad"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:114
+#: code:addons/mail/static/src/xml/thread.xml:99
 #, python-format
 msgid "Congratulations, your inbox is empty"
 msgstr "¡Enhorabuena! Su bandeja de entrada está vacía."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:662
+#: code:addons/mail/static/src/js/discuss.js:866
 #, python-format
 msgid "Congratulations, your inbox is empty!"
 msgstr "¡Enhorabuena! Su bandeja de entrada está vacía."
@@ -1126,7 +1173,6 @@ msgstr "Contenido"
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__body
 #: model:ir.model.fields,field_description:mail.field_mail_mail__body
 #: model:ir.model.fields,field_description:mail.field_mail_message__body
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__body
 msgid "Contents"
 msgstr "Contenidos"
 
@@ -1156,7 +1202,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:318
+#: code:addons/mail/static/src/js/discuss.js:502
 #, python-format
 msgid "Create %s"
 msgstr "Crear %s"
@@ -1167,12 +1213,23 @@ msgid "Create Date"
 msgstr "Fecha de Creación"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:350
+#: code:addons/mail/models/mail_thread.py:377
 #, python-format
 msgid "Create a new %(document)s"
 msgstr ""
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:369
+#, python-format
+msgid "Create a new %(document)s by sending an email to %(email_link)s"
+msgstr ""
+
+#. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Create a new Record"
+msgstr "Crear un nuevo registro"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Created By"
 msgstr "Creado por"
@@ -1189,6 +1246,10 @@ msgstr "Creado por"
 #: model:ir.model.fields,field_description:mail.field_mail_mail__create_uid
 #: model:ir.model.fields,field_description:mail.field_mail_message__create_uid
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__create_uid
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_uid
 #: model:ir.model.fields,field_description:mail.field_mail_template__create_uid
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_uid
@@ -1209,6 +1270,10 @@ msgstr "Creado por"
 #: model:ir.model.fields,field_description:mail.field_mail_mail__create_date
 #: model:ir.model.fields,field_description:mail.field_mail_message__create_date
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__create_date
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_date
 #: model:ir.model.fields,field_description:mail.field_mail_template__create_date
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_date
@@ -1219,23 +1284,27 @@ msgstr "Creado el"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_search
-msgid "Creation Month"
-msgstr "Mes de Creación"
+msgid "Creation Date"
+msgstr "Fecha de Creación"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_compose_message__starred
 #: model:ir.model.fields,help:mail.field_mail_mail__starred
 #: model:ir.model.fields,help:mail.field_mail_message__starred
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__starred
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "El usuario actual tiene una notificación destacada asociada a este mensaje"
 
 #. module: mail
+#: model:ir.model.fields,help:mail.field_mail_channel__is_moderator
+msgid "Current user is a moderator of the channel"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
 #: model:ir.model.fields,field_description:mail.field_mail_mail__date
 #: model:ir.model.fields,field_description:mail.field_mail_message__date
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__date
+#: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Date"
 msgstr "Fecha"
 
@@ -1292,30 +1361,20 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete Emails"
 msgstr "Borrar correos"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete_message
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete_message
 msgid "Delete Message Copy"
 msgstr "Borrar copia del mensaje"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete sent emails (mass mailing only)"
 msgstr "Borrar correos enviados (solo envíos masivos)"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:325
-#, python-format
-msgid "Delete this attachment"
-msgstr "Eliminar este adjunto"
-
-#. module: mail
 #: selection:mail.mail,state:0
 msgid "Delivery Failed"
 msgstr "Entrega fallida"
@@ -1339,7 +1398,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:46
+#: code:addons/mail/static/src/xml/discuss.xml:52
 #, python-format
 msgid "Direct Messages"
 msgstr "Mensajes directos"
@@ -1347,6 +1406,7 @@ msgstr "Mensajes directos"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:81
+#: code:addons/mail/static/src/xml/discuss.xml:150
 #: model:ir.ui.view,arch_db:mail.email_template_preview_form
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
 #, python-format
@@ -1354,6 +1414,30 @@ msgid "Discard"
 msgstr "Descartar"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid "Discard delivery failures"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.mail_resend_cancel_action
+msgid "Discard mail delivery failures"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:150
+#, python-format
+msgid "Discard selected messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:255
+#, python-format
+msgid "Discard |"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.menu,name:mail.mail_channel_menu_root_chat
 #: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 msgid "Discuss"
@@ -1370,6 +1454,11 @@ msgid "Discussions"
 msgstr "Debates"
 
 #. module: mail
+#: model:ir.model,name:mail.model_mail_resend_cancel
+msgid "Dismiss notification for resend by model"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview__display_name
 #: model:ir.model.fields,field_description:mail.field_mail_activity__display_name
 #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__display_name
@@ -1383,7 +1472,11 @@ msgstr "Debates"
 #: model:ir.model.fields,field_description:mail.field_mail_mail__display_name
 #: model:ir.model.fields,field_description:mail.field_mail_message__display_name
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__display_name
 #: model:ir.model.fields,field_description:mail.field_mail_notification__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__display_name
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode__display_name
 #: model:ir.model.fields,field_description:mail.field_mail_template__display_name
 #: model:ir.model.fields,field_description:mail.field_mail_thread__display_name
@@ -1409,7 +1502,6 @@ msgstr "Mostrar el nombre del documento relacionado."
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete_message
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete_message
 msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
@@ -1449,19 +1541,11 @@ msgstr "¡Hecho! Prepare el próximo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:301
-#, python-format
-msgid "Download this PDF"
-msgstr "Descargar este PDF"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:277
-#: code:addons/mail/static/src/xml/thread.xml:290
-#: code:addons/mail/static/src/xml/thread.xml:313
+#: code:addons/mail/static/src/xml/thread.xml:30
+#: code:addons/mail/static/src/xml/thread.xml:57
 #, python-format
-msgid "Download this attachment"
-msgstr "Descargar este adjunto"
+msgid "Download"
+msgstr "Descargar"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_activity__date_deadline
@@ -1470,7 +1554,7 @@ msgstr "Fecha vencimiento"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:94
+#: code:addons/mail/static/src/js/activity.js:95
 #, python-format
 msgid "Due in %d days"
 msgstr "Vencido en %d días"
@@ -1488,6 +1572,11 @@ msgid "Edit"
 msgstr "Editar"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid "Edit Partners"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/followers.js:330
 #, python-format
@@ -1503,11 +1592,12 @@ msgstr "Editar subscripción"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_email
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__email
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__email
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 #: model:mail.activity.type,name:mail.mail_activity_data_email
 #: selection:mail.compose.message,message_type:0
 #: selection:mail.message,message_type:0
-#: selection:survey.mail.compose.message,message_type:0
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -1571,10 +1661,14 @@ msgstr ""
 "aparecerán como notificaciones de usuario."
 
 #. module: mail
+#: selection:mail.notification,failure_type:0
+msgid "Email address not found"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_compose_message__email_from
 #: model:ir.model.fields,help:mail.field_mail_mail__email_from
 #: model:ir.model.fields,help:mail.field_mail_message__email_from
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__email_from
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found and replaces the author_id field in the chatter."
@@ -1600,6 +1694,11 @@ msgid "Email message"
 msgstr "Mensaje de correo electrónico"
 
 #. module: mail
+#: model:ir.model,name:mail.model_mail_resend_message
+msgid "Email resend wizard"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_mail
 #: model:ir.ui.menu,name:mail.menu_mail_mail
 #: model:ir.ui.view,arch_db:mail.view_mail_tree
@@ -1615,7 +1714,12 @@ msgstr ""
 "publicador."
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:300
+#: selection:mail.notification,failure_type:0
+msgid "Error while connecting to smtp server"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_mail.py:306
 #, python-format
 msgid ""
 "Error without exception. Probably due do sending an email without computed "
@@ -1651,6 +1755,16 @@ msgid "Exception"
 msgstr "Excepción"
 
 #. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Execute Python Code"
+msgstr "Ejecutar el código Python"
+
+#. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Execute several actions"
+msgstr "Ejecutar varias acciones"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
@@ -1666,7 +1780,7 @@ msgid "Failed"
 msgstr "Fallido"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:368
+#: code:addons/mail/models/mail_template.py:338
 #, python-format
 msgid "Failed to render template %r using values %r"
 msgstr "Fallo al renderizar la plantilla %r usando los valores %r"
@@ -1678,6 +1792,11 @@ msgid "Failure Reason"
 msgstr "Razón del fallo"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__failure_reason
+msgid "Failure reason"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
 msgid ""
 "Failure reason. This is usually the exception thrown by the email server, "
@@ -1688,16 +1807,20 @@ msgstr ""
 " de correo."
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__failure_type
+msgid "Failure type"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
 #: model:ir.model.fields,field_description:mail.field_mail_mail__starred_partner_ids
 #: model:ir.model.fields,field_description:mail.field_mail_message__starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred_partner_ids
 msgid "Favorited By"
 msgstr "Hecho Favorito por"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:245
+#: code:addons/mail/static/src/js/activity.js:247
 #: model:ir.model.fields,field_description:mail.field_mail_activity__feedback
 #, python-format
 msgid "Feedback"
@@ -1765,211 +1888,28 @@ msgstr "Seguir"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_followers
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_event__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_track__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_mail_channel__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_note_note__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_product__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_template__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_project__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_task__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_res_users__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_follower_ids
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: model:ir.ui.view,arch_db:mail.view_followers_tree
 msgid "Followers"
 msgstr "Seguidores"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_event__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_track__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_mail_channel__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_note_note__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_product__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_template__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_project__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_task__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_res_users__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_channel_ids
 msgid "Followers (Channels)"
 msgstr "Seguidores (Canales)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_event__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_track__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_mail_channel__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_note_note__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_product__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_template__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_project__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_task__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_res_users__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_partner_ids
 msgid "Followers (Partners)"
 msgstr "Seguidores (Empresas)"
 
@@ -2009,7 +1949,6 @@ msgstr "Icono de Font Awesome ej. fa-tasks"
 #: model:ir.model.fields,field_description:mail.field_mail_mail__email_from
 #: model:ir.model.fields,field_description:mail.field_mail_message__email_from
 #: model:ir.model.fields,field_description:mail.field_mail_template__email_from
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__email_from
 msgid "From"
 msgstr "De"
 
@@ -2032,7 +1971,7 @@ msgid "Gateway"
 msgstr "Pasarela"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:54
+#: code:addons/mail/models/res_users.py:87
 #, python-format
 msgid "Go to the configuration panel"
 msgstr "Ir al panel de configuración"
@@ -2055,6 +1994,16 @@ msgid "Groups"
 msgstr "Grupos"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_guidelines_msg
+msgid "Guidelines"
+msgstr "Lineamientos"
+
+#. module: mail
+#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
+msgid "Guidelines of channel ${ctx['channel'].name}"
+msgstr ""
+
+#. module: mail
 #: selection:res.users,notification_type:0
 msgid "Handle by Emails"
 msgstr "Manejar por emails"
@@ -2065,6 +2014,11 @@ msgid "Handle in Odoo"
 msgstr "Manejo en Odoo"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__has_cancel
+msgid "Has Cancel"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_message_search
 msgid "Has Mentions"
 msgstr "Tiene menciones"
@@ -2075,6 +2029,16 @@ msgid "Has attachments"
 msgstr "Tiene adjuntos"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__has_error
+#: model:ir.model.fields,field_description:mail.field_mail_mail__has_error
+#: model:ir.model.fields,field_description:mail.field_mail_message__has_error
+#: model:ir.model.fields,help:mail.field_mail_compose_message__has_error
+#: model:ir.model.fields,help:mail.field_mail_mail__has_error
+#: model:ir.model.fields,help:mail.field_mail_message__has_error
+msgid "Has error"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_mail__headers
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Headers"
@@ -2082,10 +2046,17 @@ msgstr "Cabeceras"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+#: model:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
 msgid "Hello"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__help_message
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__message
+msgid "Help message"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
 msgid "Hidden"
 msgstr "Oculto"
@@ -2109,7 +2080,11 @@ msgstr "Ocultar el subtipo en las opciones del seguidor"
 #: model:ir.model.fields,field_description:mail.field_mail_mail__id
 #: model:ir.model.fields,field_description:mail.field_mail_message__id
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype__id
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__id
 #: model:ir.model.fields,field_description:mail.field_mail_notification__id
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__id
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__id
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__id
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode__id
 #: model:ir.model.fields,field_description:mail.field_mail_template__id
 #: model:ir.model.fields,field_description:mail.field_mail_thread__id
@@ -2144,151 +2119,37 @@ msgstr "Id del recurso seguido"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:119
-#: code:addons/mail/static/src/xml/discuss.xml:203
+#: code:addons/mail/static/src/xml/discuss.xml:127
+#: code:addons/mail/static/src/xml/discuss.xml:217
 #, python-format
 msgid "Idle"
 msgstr "Ocioso"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread
-#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread
-#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread
-#: model:ir.model.fields,help:mail.field_account_invoice__message_unread
-#: model:ir.model.fields,help:mail.field_account_payment__message_unread
-#: model:ir.model.fields,help:mail.field_account_voucher__message_unread
-#: model:ir.model.fields,help:mail.field_blog_blog__message_unread
-#: model:ir.model.fields,help:mail.field_blog_post__message_unread
-#: model:ir.model.fields,help:mail.field_calendar_event__message_unread
-#: model:ir.model.fields,help:mail.field_crm_lead__message_unread
-#: model:ir.model.fields,help:mail.field_crm_team__message_unread
-#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread
-#: model:ir.model.fields,help:mail.field_event_event__message_unread
-#: model:ir.model.fields,help:mail.field_event_registration__message_unread
-#: model:ir.model.fields,help:mail.field_event_track__message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread
-#: model:ir.model.fields,help:mail.field_forum_forum__message_unread
-#: model:ir.model.fields,help:mail.field_forum_post__message_unread
-#: model:ir.model.fields,help:mail.field_forum_tag__message_unread
-#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread
-#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread
-#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread
-#: model:ir.model.fields,help:mail.field_hr_contract__message_unread
-#: model:ir.model.fields,help:mail.field_hr_department__message_unread
-#: model:ir.model.fields,help:mail.field_hr_employee__message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense__message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread
-#: model:ir.model.fields,help:mail.field_hr_job__message_unread
-#: model:ir.model.fields,help:mail.field_hr_leave__message_unread
-#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread
 #: model:ir.model.fields,help:mail.field_mail_channel__message_unread
-#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread
-#: model:ir.model.fields,help:mail.field_mail_test__message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread
 #: model:ir.model.fields,help:mail.field_mail_thread__message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread
-#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread
-#: model:ir.model.fields,help:mail.field_mrp_production__message_unread
-#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread
-#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread
-#: model:ir.model.fields,help:mail.field_note_note__message_unread
-#: model:ir.model.fields,help:mail.field_product_product__message_unread
-#: model:ir.model.fields,help:mail.field_product_template__message_unread
-#: model:ir.model.fields,help:mail.field_project_project__message_unread
-#: model:ir.model.fields,help:mail.field_project_task__message_unread
-#: model:ir.model.fields,help:mail.field_purchase_order__message_unread
-#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread
-#: model:ir.model.fields,help:mail.field_repair_order__message_unread
 #: model:ir.model.fields,help:mail.field_res_partner__message_unread
 #: model:ir.model.fields,help:mail.field_res_users__message_unread
-#: model:ir.model.fields,help:mail.field_sale_order__message_unread
-#: model:ir.model.fields,help:mail.field_slide_channel__message_unread
-#: model:ir.model.fields,help:mail.field_slide_slide__message_unread
-#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking__message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread
-#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread
-#: model:ir.model.fields,help:mail.field_survey_survey__message_unread
-#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread
 msgid "If checked new messages require your attention."
 msgstr "Si está marcado, hay nuevos mensajes que requieren su atención"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction
-#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction
-#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction
-#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction
-#: model:ir.model.fields,help:mail.field_account_payment__message_needaction
-#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction
-#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction
-#: model:ir.model.fields,help:mail.field_blog_post__message_needaction
-#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction
-#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction
-#: model:ir.model.fields,help:mail.field_crm_team__message_needaction
-#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction
-#: model:ir.model.fields,help:mail.field_event_event__message_needaction
-#: model:ir.model.fields,help:mail.field_event_registration__message_needaction
-#: model:ir.model.fields,help:mail.field_event_track__message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction
-#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction
-#: model:ir.model.fields,help:mail.field_forum_post__message_needaction
-#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_department__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_job__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction
 #: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
-#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test__message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction
 #: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction
-#: model:ir.model.fields,help:mail.field_note_note__message_needaction
-#: model:ir.model.fields,help:mail.field_product_product__message_needaction
-#: model:ir.model.fields,help:mail.field_product_template__message_needaction
-#: model:ir.model.fields,help:mail.field_project_project__message_needaction
-#: model:ir.model.fields,help:mail.field_project_task__message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction
-#: model:ir.model.fields,help:mail.field_repair_order__message_needaction
 #: model:ir.model.fields,help:mail.field_res_partner__message_needaction
 #: model:ir.model.fields,help:mail.field_res_users__message_needaction
-#: model:ir.model.fields,help:mail.field_sale_order__message_needaction
-#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction
-#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction
-#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction
-#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction
-#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction
-#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction
 msgid "If checked, new messages require your attention."
 msgstr "Si está marcado, hay nuevos mensajes que requieren su atención."
 
 #. module: mail
+#: model:ir.model.fields,help:mail.field_mail_channel__message_has_error
+#: model:ir.model.fields,help:mail.field_mail_thread__message_has_error
+#: model:ir.model.fields,help:mail.field_res_partner__message_has_error
+#: model:ir.model.fields,help:mail.field_res_users__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
 msgid ""
 "If checked, the partners will receive an email warning they have been added "
@@ -2351,6 +2212,19 @@ msgstr ""
 "servidor de Odoo, ponga el nombre del dominio aquí."
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid ""
+"If you want to re-send them, click Cancel now, then click on the "
+"notification and review them one by one by clicking on the red envelope next"
+" to each message."
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid "Ignore all failures"
+msgstr ""
+
+#. module: mail
 #: code:addons/mail/models/mail_alias.py:130
 #, python-format
 msgid "Inactive Alias"
@@ -2358,19 +2232,24 @@ msgstr "Seudónimo inactivo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:84
+#: code:addons/mail/static/src/js/services/chat_manager.js:165
 #: code:addons/mail/static/src/xml/discuss.xml:22
-#: code:addons/mail/static/src/xml/discuss.xml:154
-#: code:addons/mail/static/src/xml/discuss.xml:164
+#: code:addons/mail/static/src/xml/discuss.xml:168
+#: code:addons/mail/static/src/xml/discuss.xml:178
 #, python-format
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
 #. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity__automated
+msgid ""
+"Indicates this activity has been created automatically and not by any user."
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_compose_message__parent_id
 #: model:ir.model.fields,help:mail.field_mail_mail__parent_id
 #: model:ir.model.fields,help:mail.field_mail_message__parent_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__parent_id
 msgid "Initial thread message."
 msgstr "Mensaje inicial del hilo"
 
@@ -2386,6 +2265,11 @@ msgid "Internal Only"
 msgstr "Solo interno"
 
 #. module: mail
+#: selection:mail.notification,failure_type:0
+msgid "Invalid email adress"
+msgstr ""
+
+#. module: mail
 #: code:addons/mail/models/mail_alias.py:88
 #, python-format
 msgid ""
@@ -2396,8 +2280,8 @@ msgstr ""
 "'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1811
-#: code:addons/mail/models/mail_thread.py:1996
+#: code:addons/mail/models/mail_thread.py:1925
+#: code:addons/mail/models/mail_thread.py:2136
 #, python-format
 msgid ""
 "Invalid record set: should be called as model (without records) or on "
@@ -2414,7 +2298,7 @@ msgstr "Símbolo no valido en la ruta %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1446
+#: code:addons/mail/static/src/js/services/chat_manager.js:1611
 #, python-format
 msgid "Invitation"
 msgstr "Invitación"
@@ -2428,7 +2312,7 @@ msgstr "Invitación para seguir %s: %s"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/discuss.js:44
-#: code:addons/mail/static/src/xml/discuss.xml:133
+#: code:addons/mail/static/src/xml/discuss.xml:141
 #, python-format
 msgid "Invite"
 msgstr "Invitar"
@@ -2443,14 +2327,14 @@ msgstr "Invitar seguidor"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/discuss.js:29
-#: code:addons/mail/static/src/xml/discuss.xml:133
+#: code:addons/mail/static/src/xml/discuss.xml:141
 #, python-format
 msgid "Invite people"
 msgstr "Invitar gente"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:882
+#: code:addons/mail/static/src/js/discuss.js:1039
 #, python-format
 msgid "Invite people to #%s"
 msgstr "Invitar personas a #%s"
@@ -2466,71 +2350,20 @@ msgid "Invited people only"
 msgstr "Personas invitadas solamente"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_event__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_track__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_is_follower
+#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Is Allowed"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Is Banned"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_is_follower
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_note_note__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_product__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_template__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_project__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_task__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_is_follower
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_is_follower
 #: model:ir.model.fields,field_description:mail.field_res_users__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_is_follower
 msgid "Is Follower"
 msgstr "Es un seguidor"
 
@@ -2555,6 +2388,11 @@ msgid "Is a member"
 msgstr "Es un miembro"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_users__is_moderator
+msgid "Is moderator"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
 msgid "Is pinned on the interface"
 msgstr "Está fijada en la interfaz"
@@ -2589,7 +2427,11 @@ msgstr "Idioma"
 #: model:ir.model.fields,field_description:mail.field_mail_mail____last_update
 #: model:ir.model.fields,field_description:mail.field_mail_message____last_update
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_moderation____last_update
 #: model:ir.model.fields,field_description:mail.field_mail_notification____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner____last_update
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode____last_update
 #: model:ir.model.fields,field_description:mail.field_mail_template____last_update
 #: model:ir.model.fields,field_description:mail.field_mail_thread____last_update
@@ -2617,6 +2459,10 @@ msgstr "Ultima vez visto"
 #: model:ir.model.fields,field_description:mail.field_mail_mail__write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_message__write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_template__write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_uid
@@ -2636,6 +2482,10 @@ msgstr "Última actualización por"
 #: model:ir.model.fields,field_description:mail.field_mail_mail__write_date
 #: model:ir.model.fields,field_description:mail.field_mail_message__write_date
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__write_date
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_date
 #: model:ir.model.fields,field_description:mail.field_mail_template__write_date
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_date
@@ -2657,14 +2507,21 @@ msgid "Late Activities"
 msgstr "Actividades tardías"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__layout
+#: model:ir.model.fields,field_description:mail.field_mail_mail__layout
+#: model:ir.model.fields,field_description:mail.field_mail_message__layout
+msgid "Layout"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
 msgid "Leave"
 msgstr "Ausencia"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:693
-#: code:addons/mail/static/src/xml/discuss.xml:112
+#: code:addons/mail/models/mail_channel.py:901
+#: code:addons/mail/static/src/xml/discuss.xml:120
 #, python-format
 msgid "Leave this channel"
 msgstr "Abandonar este canal"
@@ -2684,7 +2541,7 @@ msgstr ""
 "Lista de empresas que serán añadidas como seguidoras del documento actual."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:704
+#: code:addons/mail/models/mail_channel.py:912
 #, python-format
 msgid "List users in the current channel"
 msgstr "Listado actual de usuarios en este canal"
@@ -2711,6 +2568,13 @@ msgstr "Conversación en directo"
 
 #. module: mail
 #. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:361
+#, python-format
+msgid "Loading older messages..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
 #: code:addons/mail/static/src/js/chatter_composer.js:30
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
@@ -2736,7 +2600,6 @@ msgstr "Registrar una actividad"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__is_log
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__is_log
 msgid "Log an Internal Note"
 msgstr "Registrar una nota interna"
 
@@ -2755,20 +2618,31 @@ msgid "Log or schedule an activity"
 msgstr "Registrar o planificar una actividad"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_id
+msgid "Mail"
+msgstr "Correo electrónico"
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_activity_type_id
 #: model:ir.model.fields,field_description:mail.field_mail_mail__mail_activity_type_id
 #: model:ir.model.fields,field_description:mail.field_mail_message__mail_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_activity_type_id
 msgid "Mail Activity Type"
 msgstr "Tipo de actividad del correo electrónico"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:161
+#, python-format
+msgid "Mail Body"
+msgstr "Cuerpo del correo"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Mail Channel Form"
 msgstr "Formulario de canal de correo"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:367
+#: code:addons/mail/models/mail_mail.py:374
 #, python-format
 msgid "Mail Delivery Failed"
 msgstr "Fallo de entrega de correo"
@@ -2799,7 +2673,14 @@ msgid "Mail: Email Queue Manager"
 msgstr "Mail: Gestor de colas de email"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:813
+#: model:ir.actions.server,name:mail.ir_cron_mail_notify_channel_moderators_ir_actions_server
+#: model:ir.cron,cron_name:mail.ir_cron_mail_notify_channel_moderators
+#: model:ir.cron,name:mail.ir_cron_mail_notify_channel_moderators
+msgid "Mail: Notify channel moderators"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:915
 #, python-format
 msgid "Mailbox unavailable - %s"
 msgstr "Bandeja no disponible - %s"
@@ -2818,14 +2699,14 @@ msgstr "Marcar como hecho"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:142
 #, python-format
 msgid "Mark all as read"
 msgstr "Marcar todo como leido"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:142
 #, python-format
 msgid "Mark all read"
 msgstr "Marcar todo como leido"
@@ -2837,15 +2718,16 @@ msgstr "Marcar como Hecho"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:240
+#: code:addons/mail/static/src/xml/thread.xml:206
 #, python-format
 msgid "Mark as Read"
 msgstr "Marcar como leido"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:158
-#: code:addons/mail/static/src/xml/thread.xml:205
+#: code:addons/mail/static/src/xml/thread.xml:147
+#: code:addons/mail/static/src/xml/thread.xml:200
 #, python-format
 msgid "Mark as Todo"
 msgstr "Marcar 'Por realizar'"
@@ -2904,12 +2786,21 @@ msgstr "Combinada con las siguientes empresas:"
 #: model:ir.model,name:mail.model_mail_message
 #: model:ir.model.fields,field_description:mail.field_mail_mail__mail_message_id
 #: model:ir.model.fields,field_description:mail.field_mail_notification__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__mail_message_id
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Message"
 msgstr "Mensaje"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_has_error
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_has_error
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_has_error
+#: model:ir.model.fields,field_description:mail.field_res_users__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
 msgid "Message ID"
 msgstr "ID del mensaje"
@@ -2923,7 +2814,6 @@ msgstr "Notificaciones de mensajes"
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__record_name
 #: model:ir.model.fields,field_description:mail.field_mail_mail__record_name
 #: model:ir.model.fields,field_description:mail.field_mail_message__record_name
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__record_name
 msgid "Message Record Name"
 msgstr "Nombre de registro del mensaje"
 
@@ -2933,6 +2823,12 @@ msgid "Message Type"
 msgstr "Tipo de mensaje"
 
 #. module: mail
+#: code:addons/mail/models/mail_message.py:1194
+#, python-format
+msgid "Message are pending moderation"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_mail__email_to
 msgid "Message recipients (emails)"
 msgstr "Destinatarios del mensaje (correos electrónicos)"
@@ -2945,7 +2841,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:124
+#: code:addons/mail/static/src/xml/discuss.xml:132
 #, python-format
 msgid "Message sent in \""
 msgstr "Mensajes enviados en \""
@@ -2983,7 +2879,6 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_mail_compose_message__message_type
 #: model:ir.model.fields,help:mail.field_mail_mail__message_type
 #: model:ir.model.fields,help:mail.field_mail_message__message_type
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_type
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
@@ -2995,7 +2890,6 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_mail_compose_message__message_id
 #: model:ir.model.fields,help:mail.field_mail_mail__message_id
 #: model:ir.model.fields,help:mail.field_mail_message__message_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_id
 msgid "Message unique identifier"
 msgstr "Identificador único del mensaje"
 
@@ -3003,77 +2897,15 @@ msgstr "Identificador único del mensaje"
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_id
 #: model:ir.model.fields,field_description:mail.field_mail_mail__message_id
 #: model:ir.model.fields,field_description:mail.field_mail_message__message_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_id
 msgid "Message-Id"
 msgstr "Id del mensaje"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_ids
-#: model:ir.model.fields,field_description:mail.field_event_event__message_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_ids
-#: model:ir.model.fields,field_description:mail.field_event_track__message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_ids
 #: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_ids
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_ids
-#: model:ir.model.fields,field_description:mail.field_note_note__message_ids
-#: model:ir.model.fields,field_description:mail.field_product_product__message_ids
-#: model:ir.model.fields,field_description:mail.field_product_template__message_ids
-#: model:ir.model.fields,field_description:mail.field_project_project__message_ids
-#: model:ir.model.fields,field_description:mail.field_project_task__message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_ids
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_ids
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
 #: model:ir.model.fields,field_description:mail.field_res_users__message_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_ids
 #: model:ir.ui.menu,name:mail.menu_mail_message
 #: model:ir.ui.view,arch_db:mail.view_message_tree
 msgid "Messages"
@@ -3105,6 +2937,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_activity_type__res_model_id
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype__res_model
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__model
 #: model:ir.ui.view,arch_db:mail.view_email_template_search
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_search
 msgid "Model"
@@ -3129,16 +2962,86 @@ msgid "Models"
 msgstr "Modelos"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/services/chat_manager.js:1241
+#: model:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#, python-format
+msgid "Moderate Messages"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation
+msgid "Moderate this channel"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__moderator_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__moderator_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__moderator_id
+msgid "Moderated By"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_ids
+msgid "Moderated Emails"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_users__moderation_channel_ids
+msgid "Moderated channels"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_count
+msgid "Moderated emails count"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.mail_moderation_action
+#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Moderation"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_moderation_view_tree
+msgid "Moderation Lists"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:34
+#, python-format
+msgid "Moderation Queue"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__moderation_status
+#: model:ir.model.fields,field_description:mail.field_mail_mail__moderation_status
+#: model:ir.model.fields,field_description:mail.field_mail_message__moderation_status
+msgid "Moderation Status"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_users__moderation_counter
+msgid "Moderation count"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_moderator
+msgid "Moderator"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderator_ids
+msgid "Moderators"
+msgstr ""
+
+#. module: mail
 #: model:ir.model,name:mail.model_base_module_uninstall
 msgid "Module Uninstallation"
 msgstr "Desinstalación del módulo"
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_search
-msgid "Month"
-msgstr "Mes"
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 #: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
 msgid "My Activities"
@@ -3148,6 +3051,7 @@ msgstr "Mis actividades"
 #: model:ir.model.fields,field_description:mail.field_email_template_preview__name
 #: model:ir.model.fields,field_description:mail.field_mail_activity_type__name
 #: model:ir.model.fields,field_description:mail.field_mail_channel__name
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__name
 #: model:ir.model.fields,field_description:mail.field_mail_template__name
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Name"
@@ -3157,7 +3061,6 @@ msgstr "Nombre"
 #: model:ir.model.fields,help:mail.field_mail_compose_message__record_name
 #: model:ir.model.fields,help:mail.field_mail_mail__record_name
 #: model:ir.model.fields,help:mail.field_mail_message__record_name
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__record_name
 msgid "Name get of the related document."
 msgstr "Nombre obtenido del documento relacionado"
 
@@ -3175,30 +3078,35 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction
 #: model:ir.model.fields,field_description:mail.field_mail_mail__needaction
 #: model:ir.model.fields,field_description:mail.field_mail_message__needaction
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction
 #: model:ir.model.fields,help:mail.field_mail_compose_message__needaction
 #: model:ir.model.fields,help:mail.field_mail_mail__needaction
 #: model:ir.model.fields,help:mail.field_mail_message__needaction
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__needaction
 #: model:ir.ui.view,arch_db:mail.view_message_search
 msgid "Need Action"
 msgstr "Requiere acción"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__need_moderation
+#: model:ir.model.fields,field_description:mail.field_mail_mail__need_moderation
+#: model:ir.model.fields,field_description:mail.field_mail_message__need_moderation
+msgid "Need moderation"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
 msgid "Needaction Recipient"
 msgstr "Recipiente de la accion requerida"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:138
+#: code:addons/mail/static/src/xml/discuss.xml:145
 #, python-format
 msgid "New Channel"
 msgstr "Nuevo canal"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:137
+#: code:addons/mail/static/src/xml/discuss.xml:144
 #, python-format
 msgid "New Message"
 msgstr "Nuevo mensaje"
@@ -3235,7 +3143,7 @@ msgstr "Nuevo valor de texto"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1625
+#: code:addons/mail/static/src/js/services/chat_manager.js:1870
 #: code:addons/mail/static/src/js/services/chat_window_manager.js:283
 #: code:addons/mail/static/src/xml/systray.xml:12
 #: code:addons/mail/static/src/xml/systray.xml:21
@@ -3245,14 +3153,14 @@ msgstr "Nuevo mensaje"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:238
+#: code:addons/mail/static/src/xml/thread.xml:271
 #, python-format
 msgid "New messages"
 msgstr "Nuevo mensaje"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:115
+#: code:addons/mail/static/src/xml/thread.xml:100
 #, python-format
 msgid "New messages appear here."
 msgstr "Los mensajes nuevos se muestran aquí."
@@ -3265,85 +3173,35 @@ msgid "New people"
 msgstr "Nova gent"
 
 #. module: mail
+#: model:ir.model.fields,help:mail.field_mail_channel__moderation_guidelines
+msgid ""
+"Newcomers on this moderated channel will automatically receive the "
+"guidelines."
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_tree
 msgid "Next Activities"
 msgstr "Siguientes actividades"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_event_track__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_date_deadline
 #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_note_note__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_product_product__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_product_template__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_project_task__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_repair_order__activity_date_deadline
 #: model:ir.model.fields,field_description:mail.field_res_partner__activity_date_deadline
 #: model:ir.model.fields,field_description:mail.field_res_users__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_sale_order__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_date_deadline
 msgid "Next Activity Deadline"
 msgstr "Siguiente plazo de actividad"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_summary
-#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_summary
-#: model:ir.model.fields,field_description:mail.field_event_track__activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_summary
 #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_summary
-#: model:ir.model.fields,field_description:mail.field_note_note__activity_summary
-#: model:ir.model.fields,field_description:mail.field_product_product__activity_summary
-#: model:ir.model.fields,field_description:mail.field_product_template__activity_summary
-#: model:ir.model.fields,field_description:mail.field_project_task__activity_summary
-#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_summary
-#: model:ir.model.fields,field_description:mail.field_repair_order__activity_summary
 #: model:ir.model.fields,field_description:mail.field_res_partner__activity_summary
 #: model:ir.model.fields,field_description:mail.field_res_users__activity_summary
-#: model:ir.model.fields,field_description:mail.field_sale_order__activity_summary
-#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_summary
-#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_summary
 msgid "Next Activity Summary"
 msgstr "Resumen de la siguiente actividad"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_event_track__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_type_id
 #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_note_note__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_product_product__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_product_template__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_project_task__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_repair_order__activity_type_id
 #: model:ir.model.fields,field_description:mail.field_res_partner__activity_type_id
 #: model:ir.model.fields,field_description:mail.field_res_users__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_sale_order__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_type_id
 msgid "Next Activity Type"
 msgstr "Siguiente tipo de actividad"
 
@@ -3368,6 +3226,11 @@ msgid "No discussion yet..."
 msgstr "Sin conversación aun ..."
 
 #. module: mail
+#: selection:mail.notification,failure_type:0
+msgid "No error"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/followers.js:185
 #, python-format
@@ -3392,7 +3255,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:118
+#: code:addons/mail/static/src/xml/thread.xml:103
 #, python-format
 msgid "No starred message"
 msgstr "Sin mensaje destacado"
@@ -3401,7 +3264,6 @@ msgstr "Sin mensaje destacado"
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__no_auto_thread
 #: model:ir.model.fields,field_description:mail.field_mail_mail__no_auto_thread
 #: model:ir.model.fields,field_description:mail.field_mail_message__no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__no_auto_thread
 msgid "No threading for answers"
 msgstr "No hay un hilo para las respuestas"
 
@@ -3413,7 +3275,7 @@ msgstr "Nota"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:162
+#: code:addons/mail/static/src/xml/thread.xml:152
 #, python-format
 msgid "Note by"
 msgstr "Nota de"
@@ -3429,91 +3291,33 @@ msgid "Notification Management"
 msgstr "Gestión de notificación"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_notify_msg
+msgid "Notification message"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__notification_ids
 #: model:ir.model.fields,field_description:mail.field_mail_mail__notification_ids
 #: model:ir.model.fields,field_description:mail.field_mail_message__notification_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__notification_ids
 msgid "Notifications"
 msgstr "Notificaciones"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__notify
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers"
 msgstr "Notificar a los seguidores"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_compose_message__notify
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers of the document (mass post only)"
 msgstr "Notificar a los seguidores del documento (sólo para envíos masivos)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_res_users__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of Actions"
 msgstr "Número de acciones"
 
@@ -3527,153 +3331,47 @@ msgstr ""
 " de la acción."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_payment__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_post__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_team__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_event__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_registration__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_track__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_post__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_department__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_job__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_has_error_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_has_error_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_has_error_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction_counter
 #: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_note_note__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_product__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_template__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_project__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_task__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_repair_order__message_needaction_counter
 #: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
 #: model:ir.model.fields,help:mail.field_res_users__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_sale_order__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of messages which requires an action"
 msgstr "Número de mensajes que requieren una acción"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_invoice__message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_payment__message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_voucher__message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_blog__message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_post__message_unread_counter
-#: model:ir.model.fields,help:mail.field_calendar_event__message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_lead__message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_team__message_unread_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_event__message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_registration__message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_track__message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_forum__message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_post__message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_tag__message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_contract__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_department__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_employee__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_job__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_leave__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_has_error_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_has_error_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_has_error_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread_counter
 #: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_production__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread_counter
-#: model:ir.model.fields,help:mail.field_note_note__message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_product__message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_template__message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_project__message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_task__message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_order__message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread_counter
-#: model:ir.model.fields,help:mail.field_repair_order__message_unread_counter
 #: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
 #: model:ir.model.fields,help:mail.field_res_users__message_unread_counter
-#: model:ir.model.fields,help:mail.field_sale_order__message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_channel__message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_slide__message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking__message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread_counter
-#: model:ir.model.fields,help:mail.field_survey_survey__message_unread_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread_counter
 msgid "Number of unread messages"
 msgstr "Número de mensajes no leidos"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model:ir.ui.view,arch_db:mail.mail_notification_light
 #: model:ir.ui.view,arch_db:mail.message_notification_email
-#: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Odoo"
 msgstr "Odoo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:910
+#: code:addons/mail/static/src/js/discuss.js:1193
 #, python-format
 msgid ""
 "Odoo has now the permission to send you native notifications on this device."
@@ -3690,7 +3388,7 @@ msgstr "Odoo necesita su permiso para"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:907
+#: code:addons/mail/static/src/js/discuss.js:1190
 #, python-format
 msgid ""
 "Odoo will not have the permission to send native notifications on this "
@@ -3701,7 +3399,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:120
+#: code:addons/mail/static/src/xml/discuss.xml:128
 #, python-format
 msgid "Offline"
 msgstr "Desconectado"
@@ -3761,8 +3459,8 @@ msgstr "Un seguidor"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:118
-#: code:addons/mail/static/src/xml/discuss.xml:202
+#: code:addons/mail/static/src/xml/discuss.xml:126
+#: code:addons/mail/static/src/xml/discuss.xml:216
 #, python-format
 msgid "Online"
 msgstr "En línea"
@@ -3790,14 +3488,7 @@ msgstr "Abrir el documento padre"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:139
-#, python-format
-msgid "Open channel settings"
-msgstr "Abrir la configuración del canal"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:187
+#: code:addons/mail/static/src/xml/discuss.xml:201
 #, python-format
 msgid "Open chat"
 msgstr "Abrir chat"
@@ -3890,30 +3581,13 @@ msgstr "Correos salientes"
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_server_id
 #: model:ir.model.fields,field_description:mail.field_mail_mail__mail_server_id
 #: model:ir.model.fields,field_description:mail.field_mail_message__mail_server_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_server_id
 msgid "Outgoing mail server"
 msgstr "Servidor de correos salientes"
 
 #. module: mail
-#: selection:account.invoice,activity_state:0
-#: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
-#: selection:hr.applicant,activity_state:0
-#: selection:hr.employee,activity_state:0 selection:mail.activity,state:0
+#: selection:mail.activity,state:0
 #: selection:mail.activity.mixin,activity_state:0
-#: selection:mail.test.activity,activity_state:0
-#: selection:maintenance.equipment,activity_state:0
-#: selection:maintenance.request,activity_state:0
-#: selection:mrp.production,activity_state:0
-#: selection:mrp.unbuild,activity_state:0 selection:note.note,activity_state:0
-#: selection:product.product,activity_state:0
-#: selection:product.template,activity_state:0
-#: selection:project.task,activity_state:0
-#: selection:purchase.order,activity_state:0
-#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
-#: selection:sale.order,activity_state:0
-#: selection:stock.picking,activity_state:0
-#: selection:survey.survey,activity_state:0
 msgid "Overdue"
 msgstr "Vencimiento"
 
@@ -3938,7 +3612,6 @@ msgstr "Padre"
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__parent_id
 #: model:ir.model.fields,field_description:mail.field_mail_mail__parent_id
 #: model:ir.model.fields,field_description:mail.field_mail_message__parent_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__parent_id
 msgid "Parent Message"
 msgstr "Mensaje padre"
 
@@ -3981,6 +3654,11 @@ msgstr ""
 "subtipo de proyecto se refiere a los subtipos de tareas relacionadas."
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__partner_id
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_partner_mass_mail
 msgid "Partner Mass Mailing"
 msgstr "Envío de correo masivo a empresas"
@@ -3992,6 +3670,16 @@ msgid "Partner Profile"
 msgstr "Perfil de la empresa"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__partner_readonly
+msgid "Partner Readonly"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_resend_partner
+msgid "Partner with additionnal information for mail resend"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
 msgid "Partners that did not ask not to be included in mass mailing campaigns"
 msgstr ""
@@ -4002,11 +3690,42 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction_partner_ids
 #: model:ir.model.fields,field_description:mail.field_mail_mail__needaction_partner_ids
 #: model:ir.model.fields,field_description:mail.field_mail_message__needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction_partner_ids
 msgid "Partners with Need Action"
 msgstr "Asociados con acción requerida"
 
 #. module: mail
+#: selection:mail.compose.message,moderation_status:0
+#: selection:mail.message,moderation_status:0
+msgid "Pending Moderation"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:263
+#, python-format
+msgid "Pending moderation"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:108
+#, python-format
+msgid "Pending moderation messages appear here."
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_channel__moderation_notify
+msgid ""
+"People receive an automatic notification about their message being waiting "
+"for moderation."
+msgstr ""
+
+#. module: mail
+#: selection:mail.moderation,status:0
+msgid "Permanent Ban"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
 #: model:ir.model.fields,help:mail.field_mail_mail__auto_delete
 #: model:ir.model.fields,help:mail.field_mail_template__auto_delete
@@ -4017,14 +3736,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:906
+#: code:addons/mail/static/src/js/discuss.js:1189
 #, python-format
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:909
+#: code:addons/mail/static/src/js/discuss.js:1192
 #, python-format
 msgid "Permission granted"
 msgstr "Permiso concedido"
@@ -4041,25 +3760,9 @@ msgid "Placeholder Expression"
 msgstr "Expresión de marcador"
 
 #. module: mail
-#: selection:account.invoice,activity_state:0
-#: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
-#: selection:hr.applicant,activity_state:0
-#: selection:hr.employee,activity_state:0 selection:mail.activity,state:0
+#: selection:mail.activity,state:0
 #: selection:mail.activity.mixin,activity_state:0
-#: selection:mail.test.activity,activity_state:0
-#: selection:maintenance.equipment,activity_state:0
-#: selection:maintenance.request,activity_state:0
-#: selection:mrp.production,activity_state:0
-#: selection:mrp.unbuild,activity_state:0 selection:note.note,activity_state:0
-#: selection:product.product,activity_state:0
-#: selection:product.template,activity_state:0
-#: selection:project.task,activity_state:0
-#: selection:purchase.order,activity_state:0
-#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
-#: selection:sale.order,activity_state:0
-#: selection:stock.picking,activity_state:0
-#: selection:survey.survey,activity_state:0
 msgid "Planned"
 msgstr "Planificado"
 
@@ -4076,22 +3779,20 @@ msgid "Planned in"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:287
-#, python-format
-msgid "Play this video"
-msgstr "Ver este video"
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
+msgid "Planned in (days)"
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:157
+#: code:addons/mail/static/src/js/chatter_composer.js:158
 #, python-format
 msgid "Please complete customer's informations"
 msgstr "Por favor, complete la información del cliente"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:96
+#: code:addons/mail/static/src/js/many2many_tags_email.js:85
 #, python-format
 msgid "Please complete customer's informations and email"
 msgstr "Por favor, complete la información del cliente y el email"
@@ -4103,7 +3804,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:731
+#: code:addons/mail/static/src/js/composer.js:674
 #, python-format
 msgid "Please, wait while the file is uploading."
 msgstr "Por favor, espere mientras sube el archivo."
@@ -4134,7 +3835,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_notification_borders
-#: model:ir.ui.view,arch_db:mail.message_user_assigned
+#: model:ir.ui.view,arch_db:mail.mail_notification_light
 msgid "Powered by"
 msgstr "Con tecnología de"
 
@@ -4172,6 +3873,13 @@ msgid "Previous Activity Type"
 msgstr "Tipo de actividad previo"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:56
+#, python-format
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel__public
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Privacy"
@@ -4179,15 +3887,15 @@ msgstr "Privacidad"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:56
-#: code:addons/mail/static/src/xml/discuss.xml:176
+#: code:addons/mail/static/src/xml/discuss.xml:62
+#: code:addons/mail/static/src/xml/discuss.xml:190
 #, python-format
 msgid "Private Channels"
 msgstr "Canales privados"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:863
+#: code:addons/mail/static/src/js/discuss.js:1168
 #, python-format
 msgid "Public Channels"
 msgstr "Canales públicos"
@@ -4217,6 +3925,7 @@ msgstr "Recibido"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_id
+#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
 msgid "Recipient"
 msgstr "Destinatario"
 
@@ -4224,6 +3933,7 @@ msgstr "Destinatario"
 #: model:ir.model.fields,field_description:mail.field_email_template_preview__partner_ids
 #: model:ir.model.fields,field_description:mail.field_mail_mail__partner_ids
 #: model:ir.model.fields,field_description:mail.field_mail_message__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__partner_ids
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model:ir.ui.view,arch_db:mail.view_message_form
@@ -4258,13 +3968,39 @@ msgid "Regards,"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:149
+#, python-format
+msgid "Reject"
+msgstr "Rechazar"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:149
+#, python-format
+msgid "Reject selected messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:253
+#, python-format
+msgid "Reject |"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,moderation_status:0
+#: selection:mail.message,moderation_status:0
+msgid "Rejected"
+msgstr "Rechazado"
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_activity__res_id
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__res_id
 #: model:ir.model.fields,field_description:mail.field_mail_followers__res_id
 #: model:ir.model.fields,field_description:mail.field_mail_mail__res_id
 #: model:ir.model.fields,field_description:mail.field_mail_message__res_id
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__res_id
 msgid "Related Document ID"
 msgstr "ID del documento relacionado"
 
@@ -4276,7 +4012,6 @@ msgstr "ID del documento relacionado"
 #: model:ir.model.fields,field_description:mail.field_mail_message__model
 #: model:ir.model.fields,field_description:mail.field_mail_template__model
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_model
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__model
 msgid "Related Document Model"
 msgstr "Modelo de documento relacionado"
 
@@ -4301,6 +4036,25 @@ msgid "Relation field"
 msgstr "Campo relación"
 
 #. module: mail
+#: selection:mail.activity.type,category:0
+msgid "Reminder"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:253
+#, python-format
+msgid "Remove message with explanation"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:255
+#, python-format
+msgid "Remove message without explanation"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Remove the contextual action to use this template on related documents"
 msgstr ""
@@ -4316,7 +4070,7 @@ msgstr "Eliminar este seguidor"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:208
+#: code:addons/mail/static/src/xml/thread.xml:203
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Reply"
@@ -4326,7 +4080,6 @@ msgstr "Responder"
 #: model:ir.model.fields,help:mail.field_mail_compose_message__reply_to
 #: model:ir.model.fields,help:mail.field_mail_mail__reply_to
 #: model:ir.model.fields,help:mail.field_mail_message__reply_to
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__reply_to
 msgid ""
 "Reply email address. Setting the reply_to bypasses the automatic thread "
 "creation."
@@ -4340,7 +4093,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_mail__reply_to
 #: model:ir.model.fields,field_description:mail.field_mail_message__reply_to
 #: model:ir.model.fields,field_description:mail.field_mail_template__reply_to
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__reply_to
 msgid "Reply-To"
 msgstr "Responder a"
 
@@ -4351,28 +4103,31 @@ msgid "Report Filename"
 msgstr "Fichero del informe"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_event_track__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_user_id
+#: model:ir.actions.act_window,name:mail.mail_resend_message_action
+msgid "Resend mail"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid "Resend to selected"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__resend_wizard_id
+msgid "Resend wizard"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:49
+#, python-format
+msgid "Reset Zoom"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_note_note__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_product_product__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_product_template__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_project_task__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_repair_order__activity_user_id
 #: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
 #: model:ir.model.fields,field_description:mail.field_res_users__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_sale_order__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_user_id
 msgid "Responsible User"
 msgstr "Usuario responsable"
 
@@ -4393,6 +4148,13 @@ msgid "Rich-text/HTML message"
 msgstr "Mensaje en Texto enriquecido/HTML"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:53
+#, python-format
+msgid "Rotate"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_email_template_search
 msgid "SMTP Server"
 msgstr "Servidor SMTP"
@@ -4414,7 +4176,7 @@ msgstr "Grabar como nueva plantilla"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_window.js:40
+#: code:addons/mail/static/src/js/chat_window.js:41
 #, python-format
 msgid "Say something"
 msgstr "Diga algo"
@@ -4432,7 +4194,7 @@ msgid "Schedule activity"
 msgstr "Planificar actividad"
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:260
+#: code:addons/mail/models/mail_activity.py:297
 #, python-format
 msgid "Schedule an Activity"
 msgstr "Planificar una actividad"
@@ -4467,6 +4229,25 @@ msgid "Search Groups"
 msgstr "Grupos de busqueda"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Search Moderation List"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:146
+#, python-format
+msgid "Select All"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:146
+#, python-format
+msgid "Select all messages to moderate"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_email_template_preview__model_object_field
 #: model:ir.model.fields,help:mail.field_mail_template__model_object_field
 msgid ""
@@ -4477,25 +4258,39 @@ msgstr ""
 "Si es un campo de asociación, podrá seleccionar un campo objetivo en el destino de la asociación."
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid ""
+"Select the action to do on each mail and correct the email address if "
+"needed. The modified address will be saved on the corresponding contact."
+msgstr ""
+
+#. module: mail
 #: selection:mail.channel,public:0
 msgid "Selected group of users"
 msgstr "Grupo de usuarios seleccionado"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:428
+#: code:addons/mail/static/src/js/composer.js:384
+#: code:addons/mail/static/src/js/discuss.js:141
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Send"
 msgstr "Enviar"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__resend
+msgid "Send Again"
+msgstr ""
+
+#. module: mail
+#: selection:ir.actions.server,state:0
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail
 msgid "Send Email"
 msgstr "Enviar correo electrónico"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:295
+#: code:addons/mail/models/mail_template.py:265
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Enviar mail (%s)"
@@ -4515,6 +4310,23 @@ msgstr "Enviar un mensaje"
 
 #. module: mail
 #. openerp-web
+#: code:addons/mail/static/src/js/discuss.js:138
+#, python-format
+msgid "Send explanation to author"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Send guidelines"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_guidelines
+msgid "Send guidelines to new subscribers"
+msgstr ""
+
+#. module: mail
+#. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:53
 #, python-format
 msgid "Send message"
@@ -4545,7 +4357,7 @@ msgstr "Error en el envío"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:108
+#: code:addons/mail/static/src/xml/discuss.xml:114
 #, python-format
 msgid "Sends messages by email"
 msgstr "Enviar mensaje por correo electrónico"
@@ -4573,18 +4385,6 @@ msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:139
-#, python-format
-msgid "Settings"
-msgstr "Configuración"
-
-#. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode__shortcode_type
-msgid "Shortcode Type"
-msgstr "Tipo de codigo corto"
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_shortcode_view_form
 #: model:ir.ui.view,arch_db:mail.mail_shortcode_view_tree
 msgid "Shortcodes"
@@ -4604,7 +4404,7 @@ msgstr ""
 "hoy"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:673
+#: code:addons/mail/models/mail_channel.py:881
 #, python-format
 msgid "Show an helper message"
 msgstr "Mostrar un mensaje de ayuda"
@@ -4629,7 +4429,6 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_mail_compose_message__author_avatar
 #: model:ir.model.fields,help:mail.field_mail_mail__author_avatar
 #: model:ir.model.fields,help:mail.field_mail_message__author_avatar
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_avatar
 msgid ""
 "Small-sized image of this contact. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4656,11 +4455,6 @@ msgstr ""
 "sea necesaria."
 
 #. module: mail
-#: selection:mail.shortcode,shortcode_type:0
-msgid "Smiley"
-msgstr "Smiley"
-
-#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_id
 msgid ""
 "Specify a model if the activity should be specific to a model and not "
@@ -4671,13 +4465,12 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:89
+#: code:addons/mail/static/src/js/services/chat_manager.js:170
 #: code:addons/mail/static/src/xml/discuss.xml:28
-#: code:addons/mail/static/src/xml/discuss.xml:156
+#: code:addons/mail/static/src/xml/discuss.xml:170
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred
 #: model:ir.model.fields,field_description:mail.field_mail_mail__starred
 #: model:ir.model.fields,field_description:mail.field_mail_message__starred
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred
 #, python-format
 msgid "Starred"
 msgstr "Destacado"
@@ -4689,34 +4482,16 @@ msgstr "Estado"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_mail__state
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__status
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Status"
 msgstr "Estado"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_invoice__activity_state
-#: model:ir.model.fields,help:mail.field_crm_lead__activity_state
-#: model:ir.model.fields,help:mail.field_event_track__activity_state
-#: model:ir.model.fields,help:mail.field_hr_applicant__activity_state
-#: model:ir.model.fields,help:mail.field_hr_employee__activity_state
 #: model:ir.model.fields,help:mail.field_mail_activity_mixin__activity_state
-#: model:ir.model.fields,help:mail.field_mail_test_activity__activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_equipment__activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_request__activity_state
-#: model:ir.model.fields,help:mail.field_mrp_production__activity_state
-#: model:ir.model.fields,help:mail.field_mrp_unbuild__activity_state
-#: model:ir.model.fields,help:mail.field_note_note__activity_state
-#: model:ir.model.fields,help:mail.field_product_product__activity_state
-#: model:ir.model.fields,help:mail.field_product_template__activity_state
-#: model:ir.model.fields,help:mail.field_project_task__activity_state
-#: model:ir.model.fields,help:mail.field_purchase_order__activity_state
-#: model:ir.model.fields,help:mail.field_repair_order__activity_state
 #: model:ir.model.fields,help:mail.field_res_partner__activity_state
 #: model:ir.model.fields,help:mail.field_res_users__activity_state
-#: model:ir.model.fields,help:mail.field_sale_order__activity_state
-#: model:ir.model.fields,help:mail.field_stock_picking__activity_state
-#: model:ir.model.fields,help:mail.field_survey_survey__activity_state
 msgid ""
 "Status based on activities\n"
 "Overdue: Due date is already passed\n"
@@ -4743,12 +4518,12 @@ msgstr "Sub-modelo"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/composer.xml:8
+#: code:addons/mail/static/src/xml/discuss.xml:160
 #: model:ir.model.fields,field_description:mail.field_email_template_preview__subject
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__subject
 #: model:ir.model.fields,field_description:mail.field_mail_mail__subject
 #: model:ir.model.fields,field_description:mail.field_mail_message__subject
 #: model:ir.model.fields,field_description:mail.field_mail_template__subject
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subject
 #, python-format
 msgid "Subject"
 msgstr "Asunto"
@@ -4767,7 +4542,7 @@ msgstr "Asunto..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:221
+#: code:addons/mail/static/src/xml/thread.xml:225
 #, python-format
 msgid "Subject:"
 msgstr "Asunto:"
@@ -4782,7 +4557,6 @@ msgstr "Sustitución"
 #: model:ir.model.fields,field_description:mail.field_mail_followers__subtype_ids
 #: model:ir.model.fields,field_description:mail.field_mail_mail__subtype_id
 #: model:ir.model.fields,field_description:mail.field_mail_message__subtype_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subtype_id
 #: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
 msgid "Subtype"
 msgstr "Subtipo"
@@ -4802,7 +4576,6 @@ msgstr "Resumen"
 #. module: mail
 #: selection:mail.compose.message,message_type:0
 #: selection:mail.message,message_type:0
-#: selection:survey.mail.compose.message,message_type:0
 msgid "System notification"
 msgstr "Notificación del sistema"
 
@@ -4817,14 +4590,6 @@ msgid "Template Preview"
 msgstr "Vista previa plantilla"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:264
-#, python-format
-msgid ""
-"Template rendering failed, this could mean that your template contains "
-"python syntax errors"
-msgstr ""
-
-#. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_template_tree_all
 #: model:ir.ui.menu,name:mail.menu_email_templates
 #: model:ir.ui.view,arch_db:mail.email_template_form
@@ -4834,11 +4599,21 @@ msgid "Templates"
 msgstr "Plantillas"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+msgid "Thank you!"
+msgstr "¡Gracias!"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
 msgid "The"
 msgstr "El"
 
 #. module: mail
+#: sql_constraint:mail.moderation:0
+msgid "The email address must be unique per channel !"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
 msgid "The email sent to"
 msgstr ""
@@ -4891,9 +4666,9 @@ msgstr ""
 "dirección."
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:175
-#: code:addons/mail/models/mail_message.py:578
-#: code:addons/mail/models/mail_message.py:678
+#: code:addons/mail/models/mail_activity.py:183
+#: code:addons/mail/models/mail_message.py:680
+#: code:addons/mail/models/mail_message.py:850
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -4910,12 +4685,6 @@ msgid "The shortcut which must be replaced in the Chat Messages"
 msgstr "El atajo que debe ser reemplazado en los mensajes de chat"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode__unicode_source
-msgid "The source is replaced by this unicode character in the Chat Messages"
-msgstr ""
-"La fuente es remplazada por este carácter unicode en los mensajes del chat"
-
-#. module: mail
 #: model:ir.model.fields,help:mail.field_email_template_preview__model_id
 #: model:ir.model.fields,help:mail.field_mail_template__model_id
 msgid "The type of document this template can be used with"
@@ -4968,6 +4737,11 @@ msgid "To (Partners)"
 msgstr "A (empresas)"
 
 #. module: mail
+#: model:mail.activity.type,name:mail.mail_activity_data_todo
+msgid "To Do"
+msgstr "Por Hacer"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:14
 #: code:addons/mail/static/src/xml/extended_chat_window.xml:7
@@ -4977,28 +4751,12 @@ msgstr "Para:"
 
 #. module: mail
 #. openerp-web
-#: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:82
-#: code:addons/mail/static/src/js/thread.js:328
+#: code:addons/mail/static/src/js/activity.js:83
+#: code:addons/mail/static/src/js/thread.js:348
 #: code:addons/mail/static/src/xml/systray.xml:75
-#: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
-#: selection:hr.applicant,activity_state:0
-#: selection:hr.employee,activity_state:0 selection:mail.activity,state:0
+#: selection:mail.activity,state:0
 #: selection:mail.activity.mixin,activity_state:0
-#: selection:mail.test.activity,activity_state:0
-#: selection:maintenance.equipment,activity_state:0
-#: selection:maintenance.request,activity_state:0
-#: selection:mrp.production,activity_state:0
-#: selection:mrp.unbuild,activity_state:0 selection:note.note,activity_state:0
-#: selection:product.product,activity_state:0
-#: selection:product.template,activity_state:0
-#: selection:project.task,activity_state:0
-#: selection:purchase.order,activity_state:0
-#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
-#: selection:sale.order,activity_state:0
-#: selection:stock.picking,activity_state:0
-#: selection:survey.survey,activity_state:0
 #, python-format
 msgid "Today"
 msgstr "Hoy"
@@ -5010,13 +4768,8 @@ msgid "Today Activities"
 msgstr "Actividades de Hoy"
 
 #. module: mail
-#: model:mail.activity.type,name:mail.mail_activity_data_todo
-msgid "Todo"
-msgstr "Pendiente"
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:92
+#: code:addons/mail/static/src/js/activity.js:93
 #, python-format
 msgid "Tomorrow"
 msgstr "Mañana"
@@ -5030,7 +4783,6 @@ msgstr "Temas discutidos en este grupo..."
 #: model:ir.model.fields,help:mail.field_mail_compose_message__tracking_value_ids
 #: model:ir.model.fields,help:mail.field_mail_mail__tracking_value_ids
 #: model:ir.model.fields,help:mail.field_mail_message__tracking_value_ids
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid ""
 "Tracked values are stored in a separate model. This field allow to "
 "reconstruct the tracking and to generate statistics on the model."
@@ -5060,7 +4812,6 @@ msgstr "Valores de seguimiento"
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__tracking_value_ids
 #: model:ir.model.fields,field_description:mail.field_mail_mail__tracking_value_ids
 #: model:ir.model.fields,field_description:mail.field_mail_message__tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid "Tracking values"
 msgstr "Valores de seguimiento"
 
@@ -5068,28 +4819,56 @@ msgstr "Valores de seguimiento"
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_type
 #: model:ir.model.fields,field_description:mail.field_mail_mail__message_type
 #: model:ir.model.fields,field_description:mail.field_mail_message__message_type
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: mail
+#: model:ir.model.fields,help:mail.field_ir_actions_server__state
+msgid ""
+"Type of server action. The following values are available:\n"
+"- 'Execute Python Code': a block of python code that will be executed\n"
+"- 'Create or Copy a new Record': create a new record with new values, or copy an existing record in your database\n"
+"- 'Write on a Record': update the values of a record\n"
+"- 'Execute several actions': define an action that triggers several other server actions\n"
+"- 'Add Followers': add followers to a record (available in Discuss)\n"
+"- 'Send Email': automatically send an email (available in email_template)"
+msgstr ""
+"Tipo de acción de servidor. Están disponibles los siguientes valores:\n"
+"- 'Ejecutar código Python': un bloque de código Python que será ejecutado\n"
+"- 'Crear o duplicar un nuevo registro': crea un nuevo registro con nuevos valores, o duplica uno existente en la base de datos\n"
+"- 'Escribir en un registro': actualiza los valores de un registro\n"
+"- 'Ejecutar varias acciones': define una acción que lanza otras varias acciones de servidor\n"
+"- 'Añadir seguidores': añade seguidores a un registro (disponible en Discuss)\n"
+"- 'Enviar un correo electrónico': envía automáticamente un correo electrónico (disponible en email_template)"
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel__uuid
 msgid "UUID"
 msgstr "UUID"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:233
+#: code:addons/mail/models/mail_mail.py:238
 #, python-format
 msgid "Unable to connect to SMTP Server"
 msgstr "Imposible conectar con el servidor SMTP"
 
 #. module: mail
-#: code:addons/mail/models/mail_message.py:31
+#: code:addons/mail/models/mail_thread.py:2144
+#, python-format
+msgid "Unable to log message, please configure the sender's email address."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:2109
 #, python-format
-msgid "Unable to send email, please configure the sender's email address."
+msgid "Unable to notify message, please configure the sender's email address."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_message.py:34
+#, python-format
+msgid "Unable to post message, please configure the sender's email address."
 msgstr ""
-"No se ha podido enviar el mensaje, por favor configure el correo electrónico"
-" o la dirección del remitente."
 
 #. module: mail
 #. openerp-web
@@ -5107,145 +4886,23 @@ msgstr ""
 "elija otro."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode__unicode_source
-msgid "Unicode Character"
-msgstr "Carácter unicode"
-
-#. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread
-#: model:ir.model.fields,field_description:mail.field_event_event__message_unread
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread
-#: model:ir.model.fields,field_description:mail.field_event_track__message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread
+#: selection:mail.notification,failure_type:0
+msgid "Unknown error occured"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread
-#: model:ir.model.fields,field_description:mail.field_note_note__message_unread
-#: model:ir.model.fields,field_description:mail.field_product_product__message_unread
-#: model:ir.model.fields,field_description:mail.field_product_template__message_unread
-#: model:ir.model.fields,field_description:mail.field_project_project__message_unread
-#: model:ir.model.fields,field_description:mail.field_project_task__message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_unread
 #: model:ir.model.fields,field_description:mail.field_res_users__message_unread
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread
 msgid "Unread Messages"
 msgstr "Mensajes por leer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_event__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_track__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_note_note__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_product__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_template__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_project__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_task__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_res_users__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread_counter
 msgid "Unread Messages Counter"
 msgstr "Contador de mensajes sin leer"
 
@@ -5256,61 +4913,71 @@ msgstr "Mensajes pendientes de leer"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
-msgid "Unstar all"
-msgstr "Desmarcar todos"
+msgid "Unselect All"
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
-msgid "Unstar all messages"
-msgstr "Desmarcar todos los mensajes"
+msgid "Unselect all messages to moderate"
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:143
 #, python-format
-msgid "Unsubscribe"
-msgstr "Anular subscripción"
+msgid "Unstar all"
+msgstr "Desmarcar todos"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:143
 #, python-format
-msgid "Unsubscribe from channel"
-msgstr "Darse de baja del canal"
+msgid "Unstar all messages"
+msgstr "Desmarcar todos los mensajes"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:504
+#. openerp-web
+#: code:addons/mail/static/src/js/services/chat_manager.js:1772
+#, python-format
+msgid "Unsubscribed"
+msgstr "Suscripción anulada"
+
+#. module: mail
+#: code:addons/mail/models/mail_template.py:474
 #, python-format
 msgid "Unsupported report type %s found."
 msgstr "Tipo de informe desconocido %s."
 
 #. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Update the Record"
+msgstr "Actualizar el registro"
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:327
+#: code:addons/mail/static/src/xml/thread.xml:344
 #, python-format
 msgid "Uploading"
 msgstr "Subiendo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:731
+#: code:addons/mail/static/src/js/composer.js:674
 #, python-format
 msgid "Uploading error"
 msgstr "Error de subida"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__use_active_domain
 msgid "Use active domain"
 msgstr "Usar el dominio activo"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__template_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__template_id
 msgid "Use template"
 msgstr "Usar plantilla"
 
@@ -5333,7 +5000,7 @@ msgstr "Usuario"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:51
+#: code:addons/mail/static/src/xml/discuss.xml:57
 #: code:addons/mail/static/src/xml/extended_chat_window.xml:8
 #, python-format
 msgid "User name"
@@ -5345,7 +5012,7 @@ msgid "Users"
 msgstr "Usuarios"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Usuarios en este canal: %s %s y usted."
@@ -5363,17 +5030,17 @@ msgstr ""
 "usar (@mycompany.odoo.com)."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:696
+#: code:addons/mail/models/mail_thread.py:723
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 #, python-format
 msgid "View"
 msgstr "Ver"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:694
+#: code:addons/mail/models/mail_thread.py:721
 #, python-format
 msgid "View %s"
-msgstr ""
+msgstr "Ver %s"
 
 #. module: mail
 #. openerp-web
@@ -5418,7 +5085,6 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_compose_message__is_log
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__is_log
 msgid "Whether the message is an internal note (comment mode only)"
 msgstr "Si el mensaje es una nota interna (sólo en modo de comentario)"
 
@@ -5428,6 +5094,11 @@ msgid "Whether this model supports messages and notifications."
 msgstr "Si este modelo soporta mensajería y notificaciones."
 
 #. module: mail
+#: model:ir.ui.menu,name:mail.mail_moderation_menu
+msgid "White List / Black List"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Who can follow the group's activities?"
 msgstr "Quien puede seguir las actividades del grupo?"
@@ -5441,15 +5112,15 @@ msgstr "Escribir comentarios"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:11
+#: code:addons/mail/static/src/xml/composer.xml:12
 #, python-format
-msgid "Write Something..."
-msgstr ""
+msgid "Write something..."
+msgstr "Escriba algo..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:86
-#: code:addons/mail/static/src/js/thread.js:330
+#: code:addons/mail/static/src/js/activity.js:87
+#: code:addons/mail/static/src/js/thread.js:350
 #, python-format
 msgid "Yesterday"
 msgstr "Ayer"
@@ -5462,26 +5133,54 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr "Ha añadido a <b>%s<b> a esta conversación."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:714
+#: code:addons/mail/models/mail_channel.py:922
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Está solo en este canal."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:683
+#. openerp-web
+#: code:addons/mail/static/src/js/discuss.js:317
+#, python-format
+msgid "You are going to ban: %s. Do you confirm the action?"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/discuss.js:337
+#, python-format
+msgid "You are going to discard %s messages. Do you confirm the action?"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/discuss.js:339
+#, python-format
+msgid "You are going to discard 1 message. Do you confirm the action?"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid ""
+"You are going to send the guidelines to all the subscribers. Do you confirm "
+"the action?"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:891
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "Esta en una conversación privada con <b>@%s</s>."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:886
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Esta en el canal <b>#%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:119
+#: code:addons/mail/static/src/xml/thread.xml:104
 #, python-format
 msgid ""
 "You can mark any message as 'starred', and it shows up in this channel."
@@ -5490,7 +5189,7 @@ msgstr ""
 "canal."
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:53
+#: code:addons/mail/models/res_users.py:86
 #, python-format
 msgid ""
 "You cannot create a new user from here.\n"
@@ -5500,7 +5199,7 @@ msgstr ""
 "Para crear un nuevo usuario, vaya al panel de configuración"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:144
+#: code:addons/mail/models/mail_channel.py:239
 #, python-format
 msgid ""
 "You cannot delete those groups, as the Whole Company group is required by "
@@ -5510,25 +5209,30 @@ msgstr ""
 "requerido por otros módulos."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:342
-#, python-format
-msgid ""
-"You could also add a new %(document)s by sending an email to %(email_link)s"
-msgstr ""
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "You have been assigned to the"
 msgstr "Has sido asignado al"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1446
+#: code:addons/mail/static/src/js/services/chat_manager.js:1611
 #, python-format
 msgid "You have been invited to: "
 msgstr "Has sido invitado a:"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+msgid "You have messages to moderate, please go for the proceedings."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:107
+#, python-format
+msgid "You have no message to moderate"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_email_template_preview__attachment_ids
 #: model:ir.model.fields,help:mail.field_mail_template__attachment_ids
 msgid ""
@@ -5540,26 +5244,31 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1536
+#: code:addons/mail/static/src/js/services/chat_manager.js:1768
 #, python-format
 msgid "You unpinned your conversation with <b>%s</b>."
 msgstr "Desvinculaste tu conversación con <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1534
+#: code:addons/mail/static/src/js/services/chat_manager.js:1766
 #, python-format
 msgid "You unsubscribed from <b>%s</b>."
 msgstr "Se ha dado de baja de <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:217
+#: code:addons/mail/static/src/xml/discuss.xml:231
 #, python-format
 msgid "You:"
 msgstr "Usted:"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_light
+msgid "Your"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
@@ -5567,13 +5276,41 @@ msgid "Your message has not been sent."
 msgstr "Su mensaje no se ha enviado."
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:263
+#, python-format
+msgid "Your message is pending moderation"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:161
+#, python-format
+msgid "Your message was rejected by moderator."
+msgstr ""
+
+#. module: mail
 #: code:addons/mail/models/ir_actions.py:30
 #, python-format
 msgid "Your template should define email_from"
 msgstr "Su plantilla debería definir email_from"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:948
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:48
+#, python-format
+msgid "Zoom In"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:50
+#, python-format
+msgid "Zoom Out"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:1050
 #, python-format
 msgid "alias %s: %s"
 msgstr "alias %s: %s"
@@ -5601,7 +5338,7 @@ msgid "created"
 msgstr "creado"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:309
+#: code:addons/mail/models/mail_thread.py:336
 #, python-format
 msgid "document"
 msgstr "documento"
@@ -5684,19 +5421,19 @@ msgid "mail.alias.mixin"
 msgstr "mail.alias.mixin"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:925
+#: code:addons/mail/models/mail_thread.py:1027
 #, python-format
 msgid "model %s does not accept document creation"
 msgstr "modelo %s no acepta la creación de documentos"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:920
+#: code:addons/mail/models/mail_thread.py:1022
 #, python-format
 msgid "model %s does not accept document update"
 msgstr "modelo %s no acepta la actualización de documento"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:1015
 #, python-format
 msgid ""
 "model %s does not accept document update, fall back on document creation"
@@ -5723,14 +5460,14 @@ msgstr "ahora"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:181
+#: code:addons/mail/static/src/xml/thread.xml:171
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "on"
 msgstr "en"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:895
+#: code:addons/mail/models/mail_thread.py:997
 #, python-format
 msgid ""
 "posting a message without model should be with a null res_id (private "
@@ -5740,7 +5477,7 @@ msgstr ""
 "privado), recibido %s"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:899
+#: code:addons/mail/models/mail_thread.py:1001
 #, python-format
 msgid ""
 "posting a message without model should be with a parent_id (private message)"
@@ -5773,13 +5510,13 @@ msgid "record:"
 msgstr "registro:"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:917
+#: code:addons/mail/models/mail_thread.py:1019
 #, python-format
 msgid "reply to missing document (%s,%s)"
 msgstr "responder al documento faltante (%s,%s)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:910
+#: code:addons/mail/models/mail_thread.py:1012
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
 msgstr ""
@@ -5792,13 +5529,13 @@ msgid "res.config.settings"
 msgstr "res.config.settings"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:895
+#: code:addons/mail/models/mail_thread.py:997
 #, python-format
 msgid "resetting thread_id"
 msgstr "restablecer thread_id"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:252
+#: code:addons/mail/models/mail_channel.py:403
 #, python-format
 msgid "restricted to channel members"
 msgstr "Restringido a miembros del canal"
@@ -5816,11 +5553,11 @@ msgid "restricted to known authors"
 msgstr "restringido a autores conocidos"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:899
-#: code:addons/mail/models/mail_thread.py:917
-#: code:addons/mail/models/mail_thread.py:920
-#: code:addons/mail/models/mail_thread.py:925
-#: code:addons/mail/models/mail_thread.py:948
+#: code:addons/mail/models/mail_thread.py:1001
+#: code:addons/mail/models/mail_thread.py:1019
+#: code:addons/mail/models/mail_thread.py:1022
+#: code:addons/mail/models/mail_thread.py:1027
+#: code:addons/mail/models/mail_thread.py:1050
 #, python-format
 msgid "skipping"
 msgstr "Saltando"
@@ -5838,13 +5575,13 @@ msgid "this document"
 msgstr "este documento"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:948
+#: code:addons/mail/models/mail_thread.py:1050
 #, python-format
 msgid "unknown error"
 msgstr "error desconocido"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:888
+#: code:addons/mail/models/mail_thread.py:990
 #, python-format
 msgid "unknown target model %s"
 msgstr "modelo de destino desconocido %s"