[I18N] Update translation terms from Transifex

1 files changed, 998 insertions, 177 deletions

diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po
index 70c963806e2..c1a57d398ff 100644
--- a/addons/mail/i18n/es.po
+++ b/addons/mail/i18n/es.po
@@ -5,7 +5,7 @@
 # Translators:
 # Martin Trigaux <mat@odoo.com>, 2016
 # Rick Hunter <rick_hunter_ec@yahoo.com>, 2016
-# Oihane Crucelaegui <oihanecruce@gmail.com>, 2016
+# oihane <oihanecruce@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # Antonio Trueba <atgayol@gmail.com>, 2016
 # Galileo Sanchez <galileopy@gmail.com>, 2016
@@ -21,13 +21,21 @@
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
 # Sergio Flores <vitavitae1@gmail.com>, 2016
 # Javier Ramirez <elbomba887@gmail.com>, 2016
+# Miguel Orueta <mo@landoo.es>, 2016
+# Jesus Zapata <jesus@vauxoo.com>, 2016
+# RGB Consulting <odoo@rgbconsulting.com>, 2016
+# David de León <leceda09@gmail.com>, 2017
+# Cristian Salamea <ovnicraft@gmail.com>, 2017
+# Cristóbal Martí Oliver <info@moblesmarti.com>, 2017
+# José Antonio Cuello <inactive+Yopli2k@transifex.com>, 2017
+# Gelo Joga Landoo <gj@landoo.es>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0alpha1c\n"
+"Project-Id-Version: Odoo Server 10.saas~14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-26 10:25+0000\n"
-"PO-Revision-Date: 2016-08-26 10:25+0000\n"
-"Last-Translator: Javier Ramirez <elbomba887@gmail.com>, 2016\n"
+"POT-Creation-Date: 2017-02-15 09:49+0000\n"
+"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"Last-Translator: Gelo Joga Landoo <gj@landoo.es>, 2017\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"
@@ -39,7 +47,8 @@ msgstr ""
 #: model:mail.template,body_html:mail.mail_template_data_notification_email_default
 msgid ""
 "\n"
-"% if ctx.get('button_access'):\n"
+"<div>\n"
+"% if ctx.get('has_button_access'):\n"
 "<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
 "    <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
 "        <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
@@ -48,31 +57,31 @@ msgid ""
 "    </div>\n"
 "</div>\n"
 "% endif\n"
-"% if not ctx['is_discussion'] or not len(ctx['actions']) == 0 or ctx.get('button_access') or ctx.get('is_accessible'):\n"
-"<div summary=\"o_mail_notification\">\n"
-"<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"width: 100%; margin-top: 5px;\">\n"
+"% if not ctx['is_discussion'] or not len(ctx['actions']) == 0 or ctx.get('has_button_access'):\n"
+"<div summary=\"o_mail_notification\" style=\"padding: 0px; width:600px;\">\n"
+"<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"width: 600px; margin-top: 5px;\">\n"
 "<tbody><tr>\n"
 "    <td valign=\"center\">\n"
-"        % if ctx.get('button_access') or ctx.get('button_follow') or ctx.get('button_unfollow'):\n"
-"        <a href=\"${ctx['button_access']['url']}\" style=\"padding: 8px 12px; font-size: 12px; text-decoration: none; color: #FFFFFF; text-decoration:none !important; font-weight: 400; background-color: #a24689; border: 0px solid #a24689; border-radius:3px\">${ctx['button_access']['title']}</a>\n"
+"        % if ctx.get('has_button_access'):\n"
+"        <a href=\"${ctx['button_access']['url']}\" style=\"padding: 8px 12px; font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-weight: 400; background-color: #875A7B; border: 0px solid #875A7B; border-radius:3px\">${ctx['button_access']['title']}</a>\n"
 "        % endif\n"
 "\n"
-"        % if ctx.get('button_follow'):\n"
-"        % if ctx.get('actions'):\n"
+"        % if ctx.get('has_button_follow'):\n"
+"        % if ctx.get('has_button_access'):\n"
 "           |\n"
 "        % endif\n"
-"        <a href=\"${ctx['button_follow']['url']}\" style=\"text-decoration:none; color: #a24689; text-decoration:none !important;\">${ctx['button_follow']['title']}</a>\n"
-"        % elif ctx.get('button_unfollow'):\n"
-"        % if ctx.get('actions'):\n"
+"        <a href=\"${ctx['button_follow']['url']}\" style=\"color: #875A7B; text-decoration: none !important;\">${ctx['button_follow']['title']}</a>\n"
+"        % elif ctx.get('has_button_unfollow'):\n"
+"        % if ctx.get('has_button_access'):\n"
 "           |\n"
 "        % endif\n"
-"        <a href=\"${ctx['button_unfollow']['url']}\" style=\"text-decoration:none; color: #a24689; text-decoration:none !important;\">${ctx['button_unfollow']['title']}</a>\n"
+"        <a href=\"${ctx['button_unfollow']['url']}\" style=\"color: #875A7B; text-decoration: none !important;\">${ctx['button_unfollow']['title']}</a>\n"
 "        % endif\n"
 "\n"
 "        % if ctx.get('actions'):\n"
 "        % for action in ctx['actions']:\n"
 "        |\n"
-"        <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689; text-decoration:none !important;\">${action['title']}</a>\n"
+"        <a href=\"${action['url']}\" style=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
 "        % endfor\n"
 "        % endif\n"
 "    </td>\n"
@@ -110,24 +119,30 @@ msgid ""
 "<p style=\"color: #555555;\">\n"
 "    Sent by\n"
 "    % if ctx.get('website_url'):\n"
-"    <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n"
+"    <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #875A7B;\">\n"
 "    % endif\n"
 "    ${ctx.get('company_name')}\n"
 "    % if ctx.get('website_url'):\n"
 "    </a>\n"
 "    % endif\n"
 "    using\n"
-"    <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\">Odoo</a>.\n"
+"    <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\">Odoo</a>.\n"
 "</p>\n"
+"</div>"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:627
+#: code:addons/mail/models/mail_channel.py:641
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type_days
+msgid "# Days"
+msgstr ""
+
+#. module: mail
 #: model:mail.template,subject:mail.mail_template_data_notification_email_default
 msgid ""
 "${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -148,19 +163,26 @@ msgid "%d Messages"
 msgstr "%d mensajes"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:226
+#. openerp-web
+#: code:addons/mail/static/src/js/activity.js:32
+#, python-format
+msgid "%d days overdue"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_template.py:241
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:240
+#: code:addons/mail/models/mail_thread.py:233
 #, python-format
 msgid "%s created"
 msgstr "%s creado"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:80
+#: code:addons/mail/models/res_users.py:69
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s se ha unido a la red %s."
@@ -181,13 +203,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:178
+#: code:addons/mail/static/src/xml/thread.xml:195
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr "-------- Mostrar mensajes antiguos--------"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:631
+#: code:addons/mail/models/mail_channel.py:645
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -198,7 +220,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:538
+#: code:addons/mail/models/mail_channel.py:552
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -208,8 +230,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:461
-#: code:addons/mail/models/mail_channel.py:514
+#: code:addons/mail/models/mail_channel.py:475
+#: code:addons/mail/models/mail_channel.py:528
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -219,7 +241,7 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:164
+#: code:addons/mail/models/mail_channel.py:168
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">left <a href=\"#\" "
@@ -286,6 +308,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+msgid ""
+"<span attrs=\"{'invisible': [('use_active_domain', '=', True)]}\">\n"
+"                                    If you want to use all records according to you search criterion instead check this selection box :\n"
+"                                </span>\n"
+"                                <span attrs=\"{'invisible': [('use_active_domain', '=', False)]}\">\n"
+"                                    If you want to use only selected records please uncheck this selection box :\n"
+"                                </span>"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid ""
 "<span class=\"o_stat_text\">Add</span>\n"
@@ -300,31 +333,27 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
-msgid "<span>failed emails</span>"
-msgstr ""
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
-"<strong>All records matching your current search filter will be mailed,\n"
-"                                    not only the ids selected in the list view.</strong><br/>\n"
-"                                If you want to work only with selected ids, please uncheck the\n"
-"                                list header checkbox."
+"<strong>\n"
+"                                    All records matching your current search filter will be mailed,\n"
+"                                    not only the ids selected in the list view.\n"
+"                                </strong><br/>\n"
+"                                If you want to send a lot of emails, we recommend you to use the mass mailing module.<br/>\n"
+"                                Confirming this wizard will probably take a few minutes blocking your browser."
 msgstr ""
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
-"<strong>Moreover, if you want to send a lot of emails, we recommend you to use the mass mailing module</strong>. <br/>\n"
-"                                Confirming this wizard will probably take a few minutes blocking your browser."
+"<strong>Only records checked in list view will be used.</strong><br/>\n"
+"                                If you want to send a lot of emails, we recommend you to use the mass mailing module."
 msgstr ""
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
 #: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_defaults
 #: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
-#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
 msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
@@ -349,6 +378,7 @@ msgstr "Grupos de acceso"
 #: 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_move_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
@@ -376,6 +406,7 @@ msgstr "Grupos de acceso"
 #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_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_thread_message_needaction
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction
@@ -424,6 +455,52 @@ msgid "Active domain"
 msgstr "Dominio activo"
 
 #. module: mail
+#: model:ir.actions.act_window,name:mail.mail_activity_type_action
+#: 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_hr_applicant_activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_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_repair_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_project_issue_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_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_tree
+#: model:mail.message.subtype,name:mail.mt_activities
+msgid "Activities"
+msgstr "Actividades"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_activity
+#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_type_id
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_calendar
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
+msgid "Activity"
+msgstr "Actividad"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_activity_mixin
+msgid "Activity Mixin"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_activity_type
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
+msgid "Activity Type"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/client_action.xml:80
 #, python-format
@@ -433,6 +510,7 @@ msgstr "Añadir"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:65
+#: model:ir.model.fields,field_description:mail.field_ir_act_server_channel_ids
 #, python-format
 msgid "Add Channels"
 msgstr "Añadir canales"
@@ -440,6 +518,7 @@ msgstr "Añadir canales"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:62
+#: model:ir.model.fields,field_description:mail.field_ir_act_server_partner_ids
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
 msgid "Add Followers"
@@ -488,6 +567,7 @@ msgstr "Configuración avanzada"
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_id
 #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_alias_id
 #: model:ir.model.fields,field_description:mail.field_res_users_alias_id
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_form
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_tree
@@ -495,11 +575,6 @@ msgid "Alias"
 msgstr "Alias"
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.view_users_form_mail
-msgid "Alias Accepts Emails From"
-msgstr "El seudónimo acepta correos electrónicos de"
-
-#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_contact
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_contact
 #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_contact
@@ -516,7 +591,6 @@ msgstr "Seudónimo del dominio"
 #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_name
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_name
 #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_name
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_name
 msgid "Alias Name"
 msgstr "Seudónimo"
 
@@ -524,7 +598,6 @@ msgstr "Seudónimo"
 #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_domain
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_domain
 #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_domain
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_domain
 msgid "Alias domain"
 msgstr "Seudónimo del dominio"
 
@@ -532,7 +605,6 @@ msgstr "Seudónimo del dominio"
 #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_model_id
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_model_id
 #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_model_id
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_model_id
 msgid "Aliased Model"
 msgstr "Modelo con seudónimo"
 
@@ -556,7 +628,7 @@ msgstr "Todos los mensajes"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:192
+#: code:addons/mail/static/src/js/chat_manager.js:195
 #, python-format
 msgid "Anonymous"
 msgstr "Anónimo"
@@ -587,6 +659,16 @@ msgid "Apply"
 msgstr "Aplicar"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_user_id
+msgid "Assigned to"
+msgstr "Asignada a"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_activity_assigned
+msgid "Assigned to:"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
@@ -612,6 +694,11 @@ msgstr ""
 
 #. module: mail
 #: selection:mail.alias,alias_contact:0
+msgid "Authenticated Employees"
+msgstr ""
+
+#. module: mail
+#: selection:mail.alias,alias_contact:0
 msgid "Authenticated Partners"
 msgstr "Empresas autenticadas"
 
@@ -672,7 +759,7 @@ msgid "Auto subscription"
 msgstr "Auto suscripción"
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.res_partner_opt_out_search
+#: 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"
 
@@ -685,7 +772,6 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
 #: model:ir.model.fields,field_description:mail.field_mail_template_body_html
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #: model:ir.ui.view,arch_db:mail.view_message_form
@@ -699,6 +785,16 @@ msgid "Bounce"
 msgstr "Rebote"
 
 #. module: mail
+#: selection:mail.notification,email_status:0
+msgid "Bounced"
+msgstr "Rebotado"
+
+#. module: mail
+#: model:mail.activity.type,name:mail.mail_activity_data_call
+msgid "Call"
+msgstr "Llamada"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/followers.js:125
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
@@ -766,13 +862,13 @@ msgid "Channel"
 msgstr "Canal"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_type
-msgid "Channel Type"
+#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids
+msgid "Channel Message"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids
-msgid "Channel message ids"
+#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_type
+msgid "Channel Type"
 msgstr ""
 
 #. module: mail
@@ -826,23 +922,18 @@ msgid "Child Messages"
 msgstr "Mensajes hijos"
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.view_server_action_form_template
-msgid "Choose a template to display its values."
-msgstr "Escoja una plantilla para visualizar sus valores"
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_template_preview_form
 msgid "Choose an example"
 msgstr "Escoja un ejemplo"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:346
+#: code:addons/mail/models/mail_thread.py:339
 #, python-format
 msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:362
+#: code:addons/mail/models/mail_thread.py:355
 #, python-format
 msgid "Click here to add new %s"
 msgstr ""
@@ -869,7 +960,6 @@ msgstr "IDs de destinatarios separados por comas"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_email_template_preview_partner_to
-#: model:ir.model.fields,help:mail.field_ir_act_server_partner_to
 #: model:ir.model.fields,help:mail.field_mail_template_partner_to
 msgid ""
 "Comma-separated ids of recipient partners (placeholders may be used here)"
@@ -882,7 +972,6 @@ msgstr "Direcciones de destinatarios separadas por comas"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,help:mail.field_ir_act_server_email_to
 #: model:ir.model.fields,help:mail.field_mail_template_email_to
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr ""
@@ -956,7 +1045,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:316
+#: code:addons/mail/static/src/js/client_action.js:334
 #, python-format
 msgid "Create %s"
 msgstr ""
@@ -967,7 +1056,14 @@ msgid "Create Date"
 msgstr "Fecha de Creación"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
+msgid "Created By"
+msgstr "Creado por"
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity_create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type_create_uid
 #: model:ir.model.fields,field_description:mail.field_mail_alias_create_uid
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_create_uid
 #: model:ir.model.fields,field_description:mail.field_mail_channel_create_uid
@@ -978,6 +1074,7 @@ msgstr "Fecha de Creación"
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_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_test_create_uid
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_uid
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_uid
 msgid "Created by"
@@ -985,6 +1082,8 @@ msgstr "Creado por"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type_create_date
 #: model:ir.model.fields,field_description:mail.field_mail_alias_create_date
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_create_date
 #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_create_date
@@ -994,6 +1093,7 @@ msgstr "Creado por"
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_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_test_create_date
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_date
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_date
 msgid "Created on"
@@ -1032,6 +1132,7 @@ msgstr "Fecha"
 #: model:ir.model.fields,help:mail.field_account_asset_asset_message_last_post
 #: model:ir.model.fields,help:mail.field_account_bank_statement_message_last_post
 #: model:ir.model.fields,help:mail.field_account_invoice_message_last_post
+#: model:ir.model.fields,help:mail.field_account_move_message_last_post
 #: model:ir.model.fields,help:mail.field_account_voucher_message_last_post
 #: model:ir.model.fields,help:mail.field_blog_blog_message_last_post
 #: model:ir.model.fields,help:mail.field_blog_post_message_last_post
@@ -1059,6 +1160,7 @@ msgstr "Fecha"
 #: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_last_post
 #: model:ir.model.fields,help:mail.field_mail_channel_message_last_post
 #: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_last_post
+#: model:ir.model.fields,help:mail.field_mail_test_message_last_post
 #: model:ir.model.fields,help:mail.field_mail_thread_message_last_post
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_last_post
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_last_post
@@ -1091,6 +1193,17 @@ msgid "Date of the last message posted on the record."
 msgstr "Fecha del último mensaje publicado en el registro."
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_user_assigned
+msgid "Dear"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default
 msgid "Default"
 msgstr "Por defecto"
@@ -1105,7 +1218,6 @@ msgstr "Valor por defecto"
 #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_defaults
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_defaults
 #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_defaults
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_defaults
 msgid "Default Values"
 msgstr "Valores por defecto"
 
@@ -1147,7 +1259,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:167
+#: code:addons/mail/static/src/xml/thread.xml:184
 #, python-format
 msgid "Delete this attachment"
 msgstr "Eliminar este adjunto"
@@ -1179,7 +1291,12 @@ msgstr ""
 #: code:addons/mail/static/src/xml/client_action.xml:44
 #, python-format
 msgid "Direct Messages"
-msgstr ""
+msgstr "Mensajes directos"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+msgid "Discard"
+msgstr "Descartar"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_channel_menu_root_chat
@@ -1198,6 +1315,9 @@ msgstr "Debates"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type_display_name
 #: model:ir.model.fields,field_description:mail.field_mail_alias_display_name
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_display_name
 #: model:ir.model.fields,field_description:mail.field_mail_channel_display_name
@@ -1206,9 +1326,11 @@ msgstr "Debates"
 #: model:ir.model.fields,field_description:mail.field_mail_followers_display_name
 #: 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_res_partner_needaction_rel_display_name
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_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_test_display_name
 #: model:ir.model.fields,field_description:mail.field_mail_thread_display_name
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_display_name
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_display_name
@@ -1226,6 +1348,11 @@ msgstr ""
 "composición con esta plantilla"
 
 #. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_res_name
+msgid "Display name of the related document."
+msgstr ""
+
+#. 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 ""
@@ -1239,12 +1366,31 @@ msgid "Document Followers"
 msgstr "Seguidores del documento"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_res_name
+msgid "Document Name"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/activity.js:38
+#, python-format
+msgid "Due in %d days"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Dynamic Placeholder Generator"
 msgstr "Generador dinámico de expresiones con marcadores de posición"
 
 #. module: mail
 #. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:23
+#, python-format
+msgid "Edit"
+msgstr "Editar"
+
+#. module: mail
+#. openerp-web
 #: code:addons/mail/static/src/js/followers.js:114
 #, python-format
 msgid "Edit Subscription of "
@@ -1259,7 +1405,7 @@ msgstr "Editar subscripción"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_search
-#: model:ir.ui.view,arch_db:mail.view_server_action_form_template
+#: 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
@@ -1298,6 +1444,11 @@ msgid "Email Search"
 msgstr "Buscar correo electrónico"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_email_status
+msgid "Email Status"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id
 msgid "Email Template"
 msgstr "Plantilla de correo electrónico"
@@ -1355,6 +1506,7 @@ msgstr "Mensaje de correo electrónico"
 #. 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.base_config_settings_view_form_inherit_mail
 #: model:ir.ui.view,arch_db:mail.view_mail_tree
 msgid "Emails"
 msgstr "Correos electrónicos"
@@ -1368,7 +1520,7 @@ msgstr ""
 "publicador."
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:239
+#: code:addons/mail/models/mail_mail.py:255
 #, python-format
 msgid ""
 "Error without exception. Probably due do sending an email without computed "
@@ -1397,6 +1549,11 @@ msgid "Everyone"
 msgstr "Todos"
 
 #. module: mail
+#: selection:mail.notification,email_status:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
@@ -1412,7 +1569,7 @@ msgid "Failed"
 msgstr "Fallido"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:363
+#: code:addons/mail/models/mail_template.py:379
 #, python-format
 msgid "Failed to render template %r using values %r"
 msgstr ""
@@ -1482,7 +1639,7 @@ msgstr "Replegado"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:666
+#: code:addons/mail/models/mail_thread.py:695
 #: code:addons/mail/static/src/xml/followers.xml:21
 #, python-format
 msgid "Follow"
@@ -1494,6 +1651,7 @@ msgstr "Seguir"
 #: 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_move_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
@@ -1521,6 +1679,7 @@ msgstr "Seguir"
 #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_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_thread_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_equipment_message_follower_ids
@@ -1559,6 +1718,7 @@ msgstr "Seguidores"
 #: 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_move_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
@@ -1586,6 +1746,7 @@ msgstr "Seguidores"
 #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_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_thread_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_equipment_message_channel_ids
@@ -1622,6 +1783,7 @@ msgstr "Seguidores (Canales)"
 #: 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_move_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
@@ -1649,6 +1811,7 @@ msgstr "Seguidores (Canales)"
 #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_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_thread_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_equipment_message_partner_ids
@@ -1698,8 +1861,13 @@ msgid "Following"
 msgstr "Siguiendo"
 
 #. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_icon
+#: model:ir.model.fields,help:mail.field_mail_activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_email_from
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_email_from
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_email_from
 #: model:ir.model.fields,field_description:mail.field_mail_mail_email_from
 #: model:ir.model.fields,field_description:mail.field_mail_message_email_from
@@ -1714,12 +1882,13 @@ msgid "Gateway"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:50
+#: code:addons/mail/models/res_users.py:46
 #, python-format
 msgid "Go to the configuration panel"
 msgstr "Ir al panel de configuración"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_search
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Group By"
@@ -1736,6 +1905,13 @@ msgid "Groups"
 msgstr "Grupos"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/client_action.js:212
+#, python-format
+msgid "Has Mentions"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_message_search
 msgid "Has attachments"
 msgstr "Tiene adjuntos"
@@ -1758,6 +1934,9 @@ msgstr "Ocultar el subtipo en las opciones del seguidor"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type_id
 #: model:ir.model.fields,field_description:mail.field_mail_alias_id
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_id
 #: model:ir.model.fields,field_description:mail.field_mail_channel_id
@@ -1766,9 +1945,11 @@ msgstr "Ocultar el subtipo en las opciones del seguidor"
 #: model:ir.model.fields,field_description:mail.field_mail_followers_id
 #: 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_res_partner_needaction_rel_id
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_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_test_id
 #: model:ir.model.fields,field_description:mail.field_mail_thread_id
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_id
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_id
@@ -1780,7 +1961,6 @@ msgstr "ID"
 #: model:ir.model.fields,help:mail.field_mail_alias_alias_parent_thread_id
 #: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_parent_thread_id
 #: model:ir.model.fields,help:mail.field_mail_channel_alias_parent_thread_id
-#: model:ir.model.fields,help:mail.field_res_users_alias_parent_thread_id
 msgid ""
 "ID of the parent record holding the alias (example: project holding the task"
 " creation alias)"
@@ -1789,6 +1969,12 @@ msgstr ""
 "contiene el seudónimo para la creación de tareas)"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_icon
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type_icon
+msgid "Icon"
+msgstr "Icono"
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_followers_res_id
 #: model:ir.model.fields,help:mail.field_mail_wizard_invite_res_id
 msgid "Id of the followed resource"
@@ -1806,6 +1992,7 @@ msgstr ""
 #: 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_move_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
@@ -1833,6 +2020,7 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_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_thread_message_unread
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread
@@ -1869,6 +2057,7 @@ msgstr "Si está marcado, hay nuevos mensajes que requieren su atención"
 #: 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_move_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
@@ -1896,6 +2085,7 @@ msgstr "Si está marcado, hay nuevos mensajes que requieren su atención"
 #: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_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_thread_message_needaction
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction
@@ -1991,7 +2181,7 @@ msgstr "Seudónimo inactivo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:1008
+#: code:addons/mail/static/src/js/chat_manager.js:1036
 #: code:addons/mail/static/src/xml/client_action.xml:22
 #: code:addons/mail/static/src/xml/systray.xml:6
 #, python-format
@@ -2007,9 +2197,15 @@ msgid "Initial thread message."
 msgstr "Mensaje inicial del hilo"
 
 #. module: mail
+#: model:ir.ui.menu,name:mail.mail_channel_integrations_menu
+#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Integrations"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_internal
 msgid "Internal Only"
-msgstr ""
+msgstr "Solo interno"
 
 #. module: mail
 #: code:addons/mail/models/mail_alias.py:99
@@ -2022,7 +2218,7 @@ msgstr ""
 "'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1703
+#: code:addons/mail/models/mail_thread.py:1774
 #, python-format
 msgid ""
 "Invalid record set: should be called as model (without records) or on "
@@ -2030,21 +2226,27 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: code:addons/mail/controllers/main.py:43
+#, python-format
+msgid "Invalid token in route %s"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:601
+#: code:addons/mail/static/src/js/chat_manager.js:621
 #, python-format
 msgid "Invitation"
 msgstr "Invitación"
 
 #. module: mail
-#: code:addons/mail/wizard/invite.py:54
+#: code:addons/mail/wizard/invite.py:53
 #, python-format
 msgid "Invitation to follow %s: %s"
 msgstr "Invitación para seguir %s: %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:41
+#: code:addons/mail/static/src/js/client_action.js:42
 #: code:addons/mail/static/src/xml/client_action.xml:134
 #, python-format
 msgid "Invite"
@@ -2059,7 +2261,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:32
+#: code:addons/mail/static/src/js/client_action.js:33
 #: code:addons/mail/static/src/xml/client_action.xml:134
 #, python-format
 msgid "Invite people"
@@ -2067,7 +2269,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:648
+#: code:addons/mail/static/src/js/client_action.js:671
 #, python-format
 msgid "Invite people to #%s"
 msgstr ""
@@ -2087,6 +2289,7 @@ msgstr ""
 #: 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_move_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
@@ -2114,6 +2317,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_is_follower
 #: 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_thread_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_equipment_message_is_follower
@@ -2151,6 +2355,11 @@ msgid "Is Notification"
 msgstr "Es una notificación"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_read
+msgid "Is Read"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel_is_subscribed
 msgid "Is Subscribed"
 msgstr ""
@@ -2186,6 +2395,7 @@ msgstr "Idioma"
 #: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_last_post
 #: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_last_post
 #: model:ir.model.fields,field_description:mail.field_account_invoice_message_last_post
+#: model:ir.model.fields,field_description:mail.field_account_move_message_last_post
 #: model:ir.model.fields,field_description:mail.field_account_voucher_message_last_post
 #: model:ir.model.fields,field_description:mail.field_blog_blog_message_last_post
 #: model:ir.model.fields,field_description:mail.field_blog_post_message_last_post
@@ -2213,6 +2423,7 @@ msgstr "Idioma"
 #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_last_post
 #: model:ir.model.fields,field_description:mail.field_mail_channel_message_last_post
 #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_last_post
+#: model:ir.model.fields,field_description:mail.field_mail_test_message_last_post
 #: model:ir.model.fields,field_description:mail.field_mail_thread_message_last_post
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_last_post
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_last_post
@@ -2246,6 +2457,9 @@ msgstr "Fecha del último mensaje"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview___last_update
+#: model:ir.model.fields,field_description:mail.field_mail_activity___last_update
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin___last_update
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type___last_update
 #: model:ir.model.fields,field_description:mail.field_mail_alias___last_update
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin___last_update
 #: model:ir.model.fields,field_description:mail.field_mail_channel___last_update
@@ -2254,9 +2468,11 @@ msgstr "Fecha del último mensaje"
 #: model:ir.model.fields,field_description:mail.field_mail_followers___last_update
 #: 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_res_partner_needaction_rel___last_update
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype___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_test___last_update
 #: model:ir.model.fields,field_description:mail.field_mail_thread___last_update
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value___last_update
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite___last_update
@@ -2277,6 +2493,8 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type_write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity_write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_alias_write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_write_uid
@@ -2287,6 +2505,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_message_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_test_write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid
 msgid "Last Updated by"
@@ -2294,6 +2513,8 @@ msgstr "Última actualización por"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type_write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity_write_date
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_write_date
 #: model:ir.model.fields,field_description:mail.field_mail_alias_write_date
 #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_write_date
@@ -2304,6 +2525,7 @@ msgstr "Última actualización por"
 #: model:ir.model.fields,field_description:mail.field_mail_message_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_test_write_date
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_write_date
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date
 msgid "Last Updated on"
@@ -2316,7 +2538,7 @@ msgstr "Ausencia"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:640
+#: code:addons/mail/models/mail_channel.py:654
 #: code:addons/mail/static/src/xml/client_action.xml:101
 #, python-format
 msgid "Leave this channel"
@@ -2336,7 +2558,7 @@ msgstr ""
 "Lista de empresas que serán añadidas como seguidoras del documento actual."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:651
+#: code:addons/mail/models/mail_channel.py:665
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
@@ -2358,7 +2580,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:37
+#: code:addons/mail/static/src/js/chatter.js:40
 #, python-format
 msgid "Log"
 msgstr "Registro (Log)"
@@ -2371,6 +2593,16 @@ msgid "Log a note. Followers will not be notified."
 msgstr ""
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+msgid "Log a note..."
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+msgid "Log an Activity"
+msgstr ""
+
+#. 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"
@@ -2391,6 +2623,16 @@ msgid ""
 "Log an internal note which will not be sent to followers, but which can be read\n"
 "                    by users accessing this document."
 msgstr ""
+"Registre una nota interna que no será enviada a los seguidores, pero podrá "
+"ser vista por los usuarios que accedan a este documento."
+
+#. 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 ""
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
@@ -2398,7 +2640,7 @@ msgid "Mail Channel Form"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:305
+#: code:addons/mail/models/mail_mail.py:321
 #, python-format
 msgid "Mail Delivery Failed"
 msgstr "Fallo de entrega de correo"
@@ -2416,11 +2658,23 @@ msgstr ""
 "existente"
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.view_emails_partner_info_form
+#: model:ir.actions.server,name:mail.ir_cron_mail_scheduler_action_ir_actions_server
+#: model:ir.cron,cron_name:mail.ir_cron_mail_scheduler_action
+#: model:ir.cron,name:mail.ir_cron_mail_scheduler_action
+msgid "Mail: Email Queue Manager"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.res_partner_view_form_inherit_mail
 msgid "Mailing Opt-Out"
 msgstr ""
 
 #. module: mail
+#: model:mail.activity.type,summary:mail.mail_activity_data_call
+msgid "Make a Call"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/client_action.xml:135
 #, python-format
@@ -2435,8 +2689,13 @@ msgid "Mark all read"
 msgstr "Marcar todo como leido"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+msgid "Mark as Done"
+msgstr "Marcar como Hecho"
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:106
+#: code:addons/mail/static/src/xml/thread.xml:121
 #, python-format
 msgid "Mark as Read"
 msgstr ""
@@ -2444,12 +2703,19 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:68
-#: code:addons/mail/static/src/xml/thread.xml:100
+#: code:addons/mail/static/src/xml/thread.xml:115
 #, python-format
 msgid "Mark as Todo"
 msgstr "Marcar 'Por realizar'"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:49
+#, python-format
+msgid "Mark as done"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
 msgid "Medium-sized photo"
 msgstr "Foto de tamaño medio"
@@ -2466,6 +2732,11 @@ msgstr ""
 "formulario y kanban."
 
 #. module: mail
+#: model:mail.activity.type,name:mail.mail_activity_data_meeting
+msgid "Meeting"
+msgstr "Reunión"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Members"
 msgstr "Socios"
@@ -2483,6 +2754,7 @@ msgstr ""
 #. module: mail
 #: 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_message_res_partner_needaction_rel_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"
@@ -2494,6 +2766,11 @@ msgid "Message ID"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_mail_notification
+msgid "Message Notifications"
+msgstr ""
+
+#. module: mail
 #: 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
@@ -2587,6 +2864,7 @@ msgstr "Id del mensaje"
 #: 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_move_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
@@ -2614,6 +2892,7 @@ msgstr "Id del mensaje"
 #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_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_thread_message_ids
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_ids
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_ids
@@ -2658,6 +2937,8 @@ msgstr "Buscar mensajes"
 #, python-format
 msgid "Messages can be <b>starred</b> to remind you to check back later."
 msgstr ""
+"Los mensajes pueden ser <b>destacados</b> para que recuerde revisarlos más "
+"tarde."
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_message_subtype_internal
@@ -2667,11 +2948,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.view_users_form_mail
-msgid "Messaging Alias"
-msgstr "Seudónimo de la mensajería"
-
-#. 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.ui.view,arch_db:mail.view_email_template_search
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_search
@@ -2679,7 +2956,7 @@ msgid "Model"
 msgstr "Modelo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_followers_res_model
+#: model:ir.model.fields,help:mail.field_mail_followers_res_model_id
 #: model:ir.model.fields,help:mail.field_mail_wizard_invite_res_model
 msgid "Model of the followed resource"
 msgstr "Modelo del recurso seguido"
@@ -2698,9 +2975,17 @@ 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"
+msgstr ""
+
+#. module: mail
 #: 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_template_name
+#: model:ir.model.fields,field_description:mail.field_mail_test_name
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Name"
 msgstr "Nombre"
@@ -2737,6 +3022,11 @@ msgid "Need Action"
 msgstr "Requiere acción"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_res_partner_id
+msgid "Needaction Recipient"
+msgstr ""
+
+#. module: mail
 #: selection:res.partner,notify_email:0
 msgid "Never"
 msgstr "Nunca"
@@ -2783,7 +3073,7 @@ msgstr "Nuevo mensaje"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:131
+#: code:addons/mail/static/src/xml/thread.xml:146
 #, python-format
 msgid "New messages"
 msgstr "Nuevo mensaje"
@@ -2797,12 +3087,90 @@ msgstr "Los mensajes nuevos se muestran aquí."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:79
+#: code:addons/mail/static/src/js/client_action.js:80
 #, python-format
 msgid "New people"
 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_hr_applicant_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_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_repair_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_project_issue_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_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 ""
+
+#. 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_hr_applicant_activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_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_repair_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_project_issue_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_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 ""
+
+#. 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_hr_applicant_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_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_repair_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_project_issue_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_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 ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:22
+#, python-format
+msgid "No activities planned."
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/followers.js:218
 #, python-format
@@ -2839,6 +3207,7 @@ msgid "No threading for answers"
 msgstr "No hay un hilo para las respuestas"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_note
 #: model:mail.message.subtype,name:mail.mt_note
 msgid "Note"
 msgstr "Nota"
@@ -2856,6 +3225,14 @@ msgid "Notification"
 msgstr "Notificación"
 
 #. 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
+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"
@@ -2872,6 +3249,7 @@ msgstr "Notificar a los seguidores del documento (sólo para envíos masivos)"
 #: 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_move_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
@@ -2899,6 +3277,7 @@ msgstr "Notificar a los seguidores del documento (sólo para envíos masivos)"
 #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_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_thread_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_equipment_message_needaction_counter
@@ -2931,10 +3310,18 @@ msgid "Number of Actions"
 msgstr "Número de acciones"
 
 #. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_type_days
+msgid ""
+"Number of days before executing the action. It allows to plan the action "
+"deadline."
+msgstr ""
+
+#. 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_move_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
@@ -2962,6 +3349,7 @@ msgstr "Número de acciones"
 #: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_needaction_counter
 #: 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_thread_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction_counter
@@ -2998,6 +3386,7 @@ msgstr "Número de mensajes que requieren una acción"
 #: 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_move_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
@@ -3025,6 +3414,7 @@ msgstr "Número de mensajes que requieren una acción"
 #: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_unread_counter
 #: 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_thread_message_unread_counter
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread_counter
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread_counter
@@ -3057,6 +3447,19 @@ msgid "Number of unread messages"
 msgstr "Número de mensajes no leidos"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_user_assigned
+msgid "Odoo"
+msgstr "Odoo"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/client_action.js:134
+#, python-format
+msgid ""
+"Odoo has now the permission to send you native notifications on this device."
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/client_action.xml:11
 #, python-format
@@ -3065,6 +3468,15 @@ msgstr "Odoo necesita su permiso para"
 
 #. module: mail
 #. openerp-web
+#: code:addons/mail/static/src/js/client_action.js:132
+#, python-format
+msgid ""
+"Odoo will not have the permission to send native notifications on this "
+"device."
+msgstr ""
+
+#. module: mail
+#. openerp-web
 #: code:addons/mail/static/src/xml/client_action.xml:113
 #, python-format
 msgid "Offline"
@@ -3153,6 +3565,13 @@ msgid "Open chat"
 msgstr "Abrir chat"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/extended_chat_window.xml:16
+#, python-format
+msgid "Open in Discuss"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_res_partner_opt_out
 #: model:ir.model.fields,field_description:mail.field_res_users_opt_out
 msgid "Opt-Out"
@@ -3162,7 +3581,6 @@ msgstr "No acepta recibir mensajes"
 #: model:ir.model.fields,help:mail.field_mail_alias_alias_force_thread_id
 #: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_force_thread_id
 #: model:ir.model.fields,help:mail.field_mail_channel_alias_force_thread_id
-#: model:ir.model.fields,help:mail.field_res_users_alias_force_thread_id
 msgid ""
 "Optional ID of a thread (record) to which all incoming messages will be "
 "attached, even if they did not reply to it. If set, this will disable the "
@@ -3234,6 +3652,32 @@ msgid "Outgoing mail server"
 msgstr "Servidor de correos salientes"
 
 #. module: mail
+#: selection:account.invoice,activity_state:0
+#: selection:crm.lead,activity_state:0 selection:hr.applicant,activity_state:0
+#: selection:mail.activity,state:0
+#: selection:mail.activity.mixin,activity_state:0
+#: selection:maintenance.equipment,activity_state:0
+#: selection:maintenance.request,activity_state:0
+#: selection:mrp.production,activity_state:0
+#: selection:mrp.repair,activity_state:0
+#: selection:mrp.unbuild,activity_state:0 selection:note.note,activity_state:0
+#: selection:project.issue,activity_state:0
+#: selection:project.task,activity_state:0
+#: selection:purchase.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"
+
+#. 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 "Overdue Activities"
+msgstr "Actividades Atrasadas"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Override author's email"
 msgstr "Sobreescribir correo electrónico del autor"
@@ -3242,7 +3686,6 @@ msgstr "Sobreescribir correo electrónico del autor"
 #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_user_id
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_user_id
 #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_user_id
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_user_id
 msgid "Owner"
 msgstr "Propietario"
 
@@ -3263,7 +3706,6 @@ msgstr "Mensaje padre"
 #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_parent_model_id
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_parent_model_id
 #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_parent_model_id
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_parent_model_id
 msgid "Parent Model"
 msgstr "Modelo padre"
 
@@ -3271,7 +3713,6 @@ msgstr "Modelo padre"
 #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_parent_thread_id
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_parent_thread_id
 #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_parent_thread_id
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_parent_thread_id
 msgid "Parent Record Thread ID"
 msgstr "ID del hilo del registro padre"
 
@@ -3279,12 +3720,14 @@ msgstr "ID del hilo del registro padre"
 #: model:ir.model.fields,help:mail.field_mail_alias_alias_parent_model_id
 #: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_parent_model_id
 #: model:ir.model.fields,help:mail.field_mail_channel_alias_parent_model_id
-#: model:ir.model.fields,help:mail.field_res_users_alias_parent_model_id
 msgid ""
 "Parent model holding the alias. The model holding the alias reference is not"
 " necessarily the model given by alias_model_id (example: project "
 "(parent_model) and task (model))"
 msgstr ""
+"Modelo padre que contiene el alias. El modelo que contiene la referencia "
+"alias no es necesariamente el modelo dado por alias_model_id (example: "
+"project (parent_model) and task (model))"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_message_subtype_parent_id
@@ -3300,13 +3743,18 @@ 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"
+
+#. module: mail
 #: code:addons/mail/models/res_partner.py:39
 #, python-format
 msgid "Partner Profile"
 msgstr "Perfil de la empresa"
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.res_partner_opt_out_search
+#: 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 ""
 "Empresas que pidieron no ser incluidos en campañas de envío masivo de "
@@ -3330,6 +3778,20 @@ msgstr ""
 "espacio"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/client_action.js:132
+#, python-format
+msgid "Permission denied"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/client_action.js:134
+#, python-format
+msgid "Permission granted"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel_image
 msgid "Photo"
 msgstr "Foto"
@@ -3342,7 +3804,31 @@ msgstr "Expresión de marcador"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:186
+#: selection:account.invoice,activity_state:0
+#: code:addons/mail/static/src/xml/activity.xml:5
+#: selection:crm.lead,activity_state:0 selection:hr.applicant,activity_state:0
+#: model:ir.ui.view,arch_db:mail.message_activity_assigned
+#: selection:mail.activity,state:0
+#: selection:mail.activity.mixin,activity_state:0
+#: selection:maintenance.equipment,activity_state:0
+#: selection:maintenance.request,activity_state:0
+#: selection:mrp.production,activity_state:0
+#: selection:mrp.repair,activity_state:0
+#: selection:mrp.unbuild,activity_state:0 selection:note.note,activity_state:0
+#: selection:project.issue,activity_state:0
+#: selection:project.task,activity_state:0
+#: selection:purchase.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 "Planned"
+msgstr "Planificado"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chatter.js:193
 #, python-format
 msgid "Please complete partner's informations"
 msgstr "Complete por favor la información de la empresa"
@@ -3356,15 +3842,8 @@ msgstr ""
 "Por favor rellene la información de la empresa y su correo electrónico."
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.view_server_action_form_template
-msgid "Please set the Base Model before setting the action details."
-msgstr ""
-"Establezca por favor el modelo base antes de establecer los detalles de la "
-"acción."
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:640
+#: code:addons/mail/static/src/js/composer.js:654
 #, python-format
 msgid "Please, wait while the file is uploading."
 msgstr "Por favor, espere mientras sube el archivo."
@@ -3380,6 +3859,10 @@ msgid ""
 "- partners: only authenticated partners\n"
 "- followers: only followers of the related document or members of following channels\n"
 msgstr ""
+"Política para publicar un mensaje en el documento utilizando el servidor de correo.\n"
+"- todo el mundo: todos pueden publicar\n"
+"- socios: sólo socios autenticados\n"
+"- seguidores: sólo seguidores del documento relacionado o miembros de los siguientes canales\n"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -3394,6 +3877,11 @@ msgstr ""
 "- Todos los mensajes: Se enviará un correo para cada notificación que reciba en su bandeja de entrada"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_user_assigned
+msgid "Powered by"
+msgstr "Con tecnología de"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Preferred reply address"
 msgstr "Dirección de respuesta favorita"
@@ -3431,18 +3919,30 @@ msgstr "Canales privados"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:138
+#: code:addons/mail/static/src/js/client_action.js:146
 #, python-format
 msgid "Public Channels"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:180
+#: model:ir.actions.server,name:mail.ir_cron_module_update_notification_ir_actions_server
+#: model:ir.cron,cron_name:mail.ir_cron_module_update_notification
+#: model:ir.cron,name:mail.ir_cron_module_update_notification
+msgid "Publisher: Update Notification"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:178
 #, python-format
 msgid "Re:"
 msgstr "Re:"
 
 #. module: mail
+#: selection:mail.notification,email_status:0
+msgid "Ready to Send"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0
 msgid "Received"
 msgstr "Recibido"
@@ -3466,7 +3966,6 @@ msgstr "Destinatarios"
 #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_force_thread_id
 #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_force_thread_id
 #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_force_thread_id
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_force_thread_id
 msgid "Record Thread ID"
 msgstr "Id. del hijo de registro"
 
@@ -3476,6 +3975,7 @@ msgid "References"
 msgstr "Referencias"
 
 #. 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
@@ -3487,8 +3987,10 @@ msgstr "ID del documento relacionado"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_model
+#: model:ir.model.fields,field_description:mail.field_mail_activity_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_activity_res_model_id
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_model
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_followers_res_model_id
 #: model:ir.model.fields,field_description:mail.field_mail_mail_model
 #: model:ir.model.fields,field_description:mail.field_mail_message_model
 #: model:ir.model.fields,field_description:mail.field_mail_template_model
@@ -3498,6 +4000,11 @@ msgid "Related Document Model"
 msgstr "Modelo de documento relacionado"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_followers_res_model
+msgid "Related Document Model Name"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_tracking_value_form
 msgid "Related Message"
 msgstr ""
@@ -3513,6 +4020,18 @@ msgid "Relation field"
 msgstr "Campo relación"
 
 #. module: mail
+#: model:mail.activity.type,summary:mail.mail_activity_data_meeting
+msgid "Reminder for meeting"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:24
+#, python-format
+msgid "Remove"
+msgstr "Eliminar"
+
+#. 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 ""
@@ -3528,7 +4047,7 @@ msgstr "Eliminar este seguidor"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:103
+#: code:addons/mail/static/src/xml/thread.xml:118
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Reply"
@@ -3563,6 +4082,28 @@ 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_hr_applicant_activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_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_repair_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_project_issue_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_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"
+msgstr "Responsable"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #: model:ir.ui.view,arch_db:mail.view_mail_tree
 msgid "Retry"
@@ -3579,6 +4120,12 @@ msgid "Rich-text/HTML message"
 msgstr "Mensaje en Texto enriquecido/HTML"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:829
+#, python-format
+msgid "Routing mail with Message-Id %s: route %s: %s"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_email_template_search
 msgid "SMTP Server"
 msgstr "Servidor SMTP"
@@ -3600,12 +4147,32 @@ msgstr "Grabar como nueva plantilla"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_window.js:35
+#: code:addons/mail/static/src/js/chat_window.js:36
 #, python-format
 msgid "Say something"
 msgstr "Diga algo"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+msgid "Schedule"
+msgstr "Planificacion"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:62
+#, python-format
+msgid "Schedule an Activity"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:62
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
+#, python-format
+msgid "Schedule an activity"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_scheduled_date
 #: model:ir.model.fields,field_description:mail.field_mail_template_scheduled_date
 msgid "Scheduled Date"
@@ -3618,6 +4185,11 @@ msgid "Scheduled Send Date"
 msgstr ""
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_activity_assigned
+msgid "Scheduled for:"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_search
 msgid "Search Alias"
 msgstr "Buscar seudónimo"
@@ -3656,7 +4228,7 @@ msgid "Send Email"
 msgstr "Enviar correo electrónico"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:247
+#: code:addons/mail/models/mail_template.py:262
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Enviar mail (%s)"
@@ -3675,13 +4247,17 @@ msgid "Send a message"
 msgstr "Enviar un mensaje"
 
 #. module: mail
+#: model:mail.activity.type,summary:mail.mail_activity_data_email
+msgid "Send an Email"
+msgstr "Enviar un correo"
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
 msgid "Send messages by email"
 msgstr ""
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_email_template_preview_email_from
-#: model:ir.model.fields,help:mail.field_ir_act_server_email_from
 #: model:ir.model.fields,help:mail.field_mail_template_email_from
 msgid ""
 "Sender address (placeholders may be used here). If not set, the default "
@@ -3693,6 +4269,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
+#: code:addons/mail/static/src/js/chatter.js:395
+#, python-format
+msgid "Sending Error"
+msgstr ""
+
+#. module: mail
+#. openerp-web
 #: code:addons/mail/static/src/xml/client_action.xml:97
 #, python-format
 msgid "Sends messages by email"
@@ -3700,10 +4283,17 @@ msgstr ""
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0
+#: selection:mail.notification,email_status:0
 msgid "Sent"
 msgstr "Enviado"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_email
+msgid "Sent by Email"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type_sequence
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_sequence
 msgid "Sequence"
 msgstr "Secuencia"
@@ -3717,7 +4307,7 @@ msgstr "Configuración"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode_shortcode_type
-msgid "Shortcode type"
+msgid "Shortcode Type"
 msgstr ""
 
 #. module: mail
@@ -3732,7 +4322,13 @@ msgid "Shortcut"
 msgstr "Acceso rápido"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:620
+#: 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 "Show all records which has next action date is before today"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:634
 #, python-format
 msgid "Show an helper message"
 msgstr ""
@@ -3801,8 +4397,15 @@ msgid "Smiley"
 msgstr ""
 
 #. 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 modeland not "
+"available when managing activities for other models."
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:1014
+#: code:addons/mail/static/src/js/chat_manager.js:1042
 #: code:addons/mail/static/src/xml/client_action.xml:28
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
 #: model:ir.model.fields,field_description:mail.field_mail_mail_starred
@@ -3813,6 +4416,29 @@ msgid "Starred"
 msgstr "Destacado"
 
 #. 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_hr_applicant_activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_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_repair_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_project_issue_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_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 "State"
+msgstr "Estado"
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_mail_state
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #: model:ir.ui.view,arch_db:mail.view_mail_search
@@ -3820,6 +4446,32 @@ 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_hr_applicant_activity_state
+#: model:ir.model.fields,help:mail.field_mail_activity_mixin_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_repair_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_project_issue_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_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"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_sub_model_object_field
 #: model:ir.model.fields,field_description:mail.field_mail_template_sub_model_object_field
 msgid "Sub-field"
@@ -3835,7 +4487,6 @@ msgstr "Sub-modelo"
 #. openerp-web
 #: code:addons/mail/static/src/xml/composer.xml:8
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_subject
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_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
@@ -3847,7 +4498,6 @@ msgstr "Asunto"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_email_template_preview_subject
-#: model:ir.model.fields,help:mail.field_ir_act_server_subject
 #: model:ir.model.fields,help:mail.field_mail_template_subject
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Subject (placeholders may be used here)"
@@ -3860,7 +4510,7 @@ msgstr "Asunto..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:115
+#: code:addons/mail/static/src/xml/thread.xml:130
 #, python-format
 msgid "Subject:"
 msgstr "Asunto:"
@@ -3874,7 +4524,7 @@ msgstr "Sustitución"
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_subtype_id
 #: 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_2118
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_id_2012
 #: 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"
@@ -3887,6 +4537,12 @@ msgid "Subtypes"
 msgstr "Subtipo"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type_summary
+msgid "Summary"
+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
@@ -3894,6 +4550,11 @@ msgid "System notification"
 msgstr "Notificación del sistema"
 
 #. module: mail
+#: model:mail.activity.type,summary:mail.mail_activity_data_todo
+msgid "Task to perform"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.wizard_email_template_preview
 msgid "Template Preview"
 msgstr "Vista previa plantilla"
@@ -3908,6 +4569,11 @@ msgid "Templates"
 msgstr "Plantillas"
 
 #. module: mail
+#: model:ir.model,name:mail.model_mail_test
+msgid "Test Mail Model"
+msgstr "Modelo de envío de prueba"
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_channel_alias_id
 msgid ""
 "The email address associated with this group. New emails received will "
@@ -3925,7 +4591,6 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_mail_alias_alias_model_id
 #: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_model_id
 #: model:ir.model.fields,help:mail.field_mail_channel_alias_model_id
-#: model:ir.model.fields,help:mail.field_res_users_alias_model_id
 msgid ""
 "The model (Odoo Document Kind) to which this alias corresponds. Any incoming"
 " email that does not reply to an existing record will cause the creation of "
@@ -3940,7 +4605,6 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_mail_alias_alias_name
 #: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_name
 #: model:ir.model.fields,help:mail.field_mail_channel_alias_name
-#: model:ir.model.fields,help:mail.field_res_users_alias_name
 msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
@@ -3953,7 +4617,6 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_mail_alias_alias_user_id
 #: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_user_id
 #: model:ir.model.fields,help:mail.field_mail_channel_alias_user_id
-#: model:ir.model.fields,help:mail.field_res_users_alias_user_id
 msgid ""
 "The owner of records created upon receiving emails on this alias. If this "
 "field is not set the system will attempt to find the right owner based on "
@@ -3967,8 +4630,8 @@ msgstr ""
 "dirección."
 
 #. module: mail
-#: code:addons/mail/models/mail_message.py:555
-#: code:addons/mail/models/mail_message.py:650
+#: code:addons/mail/models/mail_message.py:572
+#: code:addons/mail/models/mail_message.py:667
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -3991,15 +4654,6 @@ msgid "The type of document this template can be used with"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.view_server_action_form_template
-msgid ""
-"The values displayed hereunder are informative. When sending the email, the values\n"
-"                                will be taken from the email template."
-msgstr ""
-"Los valores que se muestran a continuación son informativos. Cuando envíe el"
-" correo electrónico, los valores serán cogidos de la plantilla."
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.message_origin_link
 msgid "This"
 msgstr ""
@@ -4032,14 +4686,12 @@ msgstr "Para"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_email_to
 #: model:ir.model.fields,field_description:mail.field_mail_template_email_to
 msgid "To (Emails)"
 msgstr "Para (correos electrónicos)"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_partner_to
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_partner_to
 #: model:ir.model.fields,field_description:mail.field_mail_mail_recipient_ids
 #: model:ir.model.fields,field_description:mail.field_mail_template_partner_to
 msgid "To (Partners)"
@@ -4061,12 +4713,40 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread.js:230
+#: selection:account.invoice,activity_state:0
+#: code:addons/mail/static/src/js/activity.js:26
+#: code:addons/mail/static/src/js/thread.js:231
+#: selection:crm.lead,activity_state:0 selection:hr.applicant,activity_state:0
+#: selection:mail.activity,state:0
+#: selection:mail.activity.mixin,activity_state:0
+#: selection:maintenance.equipment,activity_state:0
+#: selection:maintenance.request,activity_state:0
+#: selection:mrp.production,activity_state:0
+#: selection:mrp.repair,activity_state:0
+#: selection:mrp.unbuild,activity_state:0 selection:note.note,activity_state:0
+#: selection:project.issue,activity_state:0
+#: selection:project.task,activity_state:0
+#: selection:purchase.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"
 
 #. 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 "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/xml/client_action.xml:133
 #, python-format
@@ -4074,6 +4754,13 @@ msgid "Toggle Channels"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/activity.js:36
+#, python-format
+msgid "Tomorrow"
+msgstr "Mañana"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Topics discussed in this group..."
 msgstr "Temas discutidos en este grupo..."
@@ -4111,7 +4798,7 @@ msgstr ""
 #: 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 ""
+msgstr "Valores de seguimiento"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_type
@@ -4127,13 +4814,10 @@ msgid "UUID"
 msgstr "UUID"
 
 #. module: mail
-#: code:addons/mail/models/mail_message.py:44
+#: code:addons/mail/models/mail_message.py:30
 #, python-format
-msgid ""
-"Unable to send email, please configure the sender's email address or alias."
+msgid "Unable to send email, please configure the sender's email address."
 msgstr ""
-"No se ha podido enviar el mensaje, por favor configure el correo electrónico"
-" o el seudónimo del remitente."
 
 #. module: mail
 #. openerp-web
@@ -4144,7 +4828,7 @@ msgstr "Deshacer"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:667
+#: code:addons/mail/models/mail_thread.py:699
 #: code:addons/mail/static/src/xml/followers.xml:23
 #, python-format
 msgid "Unfollow"
@@ -4163,6 +4847,7 @@ msgstr ""
 #: 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_move_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
@@ -4190,6 +4875,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_unread
 #: 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_thread_message_unread
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread
@@ -4226,6 +4912,7 @@ msgstr "Mensajes por leer"
 #: 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_move_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
@@ -4253,6 +4940,7 @@ msgstr "Mensajes por leer"
 #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_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_thread_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_equipment_message_unread_counter
@@ -4318,15 +5006,21 @@ msgid "Unsubscribe from channel"
 msgstr ""
 
 #. 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 "Upcoming Activities (7 days)"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:169
+#: code:addons/mail/static/src/xml/thread.xml:186
 #, python-format
 msgid "Uploading"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:640
+#: code:addons/mail/static/src/js/composer.js:654
 #, python-format
 msgid "Uploading error"
 msgstr "Error de subida"
@@ -4344,6 +5038,11 @@ msgid "Use template"
 msgstr "Usar plantilla"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail
+msgid "Use your own email servers"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_message_subtype_sequence
 msgid "Used to order subtypes."
 msgstr "Usado para ordenar los subtipos."
@@ -4361,14 +5060,23 @@ msgid "Users"
 msgstr "Usuarios"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:664
+#: code:addons/mail/models/mail_channel.py:678
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:654
-#: code:addons/mail/models/mail_thread.py:656
+#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail
+msgid ""
+"Using your own email server is required to send/receive emails in Community "
+"and Enterprise versions. Online users already benefit from a ready-to-use "
+"email server (@mycompany.odoo.com)."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:667
+#: code:addons/mail/models/mail_thread.py:669
+#: model:ir.ui.view,arch_db:mail.message_user_assigned
 #, python-format
 msgid "View"
 msgstr "Ver"
@@ -4423,32 +5131,33 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread.js:232
+#: code:addons/mail/static/src/js/activity.js:30
+#: code:addons/mail/static/src/js/thread.js:233
 #, python-format
 msgid "Yesterday"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:78
+#: code:addons/mail/static/src/js/client_action.js:79
 #, python-format
 msgid "You added <b>%s</b> to the conversation."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:661
+#: code:addons/mail/models/mail_channel.py:675
 #, python-format
 msgid "You are alone in this channel."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:630
+#: code:addons/mail/models/mail_channel.py:644
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:625
+#: code:addons/mail/models/mail_channel.py:639
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr ""
@@ -4460,9 +5169,11 @@ msgstr ""
 msgid ""
 "You can mark any message as 'starred', and it shows up in this channel."
 msgstr ""
+"Puede marcar cualquier mensaje como «destacado», y se mostrará en este "
+"canal."
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:49
+#: code:addons/mail/models/res_users.py:45
 #, python-format
 msgid ""
 "You cannot create a new user from here.\n"
@@ -4472,7 +5183,7 @@ msgstr ""
 "Para crear un nuevo usuario, vaya al panel de configuración"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:132
+#: code:addons/mail/models/mail_channel.py:133
 #, python-format
 msgid ""
 "You cannot delete those groups, as the Whole Company group is required by "
@@ -4482,7 +5193,7 @@ msgstr ""
 "requerido por otros módulos."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:353
+#: code:addons/mail/models/mail_thread.py:346
 #, python-format
 msgid ""
 "You could also add a new %(document)s by sending an email to: "
@@ -4490,8 +5201,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_user_assigned
+msgid "You have been assigned to the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:601
+#: code:addons/mail/static/src/js/chat_manager.js:621
 #, python-format
 msgid "You have been invited to: "
 msgstr ""
@@ -4508,32 +5224,44 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:497
+#: code:addons/mail/static/src/js/chat_manager.js:517
 #, python-format
 msgid "You unpinned your conversation with <b>%s</b>."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:495
+#: code:addons/mail/static/src/js/chat_manager.js:515
 #, python-format
 msgid "You unsubscribed from <b>%s</b>."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.view_server_action_form_template
-msgid ""
-"Your template does not defined the email address of the sender. Please "
-"update your template."
+#. openerp-web
+#: code:addons/mail/static/src/js/chatter.js:395
+#, python-format
+msgid "Your message has not been sent."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/ir_actions.py:33
+#: code:addons/mail/models/ir_actions.py:30
 #, python-format
 msgid "Your template should define email_from"
 msgstr ""
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:963
+#, python-format
+msgid "alias %s does not accept unknown author"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:959
+#, python-format
+msgid "alias %s restricted to internal followers"
+msgstr ""
+
+#. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr "base.config.settings"
@@ -4549,12 +5277,24 @@ msgid "created"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:319
+#: code:addons/mail/models/mail_thread.py:312
 #, python-format
 msgid "document"
 msgstr "documento"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_activity_done
+msgid ""
+"done\n"
+"        by"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+msgid "e.g. Discuss proposal"
+msgstr "Por ejemplo, discusión de una propuesta"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/client_action.xml:11
 #, python-format
@@ -4611,12 +5351,31 @@ msgid "mention(s) marked as read."
 msgstr ""
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:938
+#, python-format
+msgid "model %s does not accept document creation"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:933
+#, python-format
+msgid "model %s does not accept document update"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:926
+#, python-format
+msgid ""
+"model %s does not accept document update, fall back on document creation"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.message_origin_link
 msgid "modified"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
+#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail
 msgid "mycompany.odoo.com"
 msgstr "mycompany.odoo.com"
 
@@ -4636,6 +5395,28 @@ msgid "on"
 msgstr "en"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:16
+#, python-format
+msgid "planned by"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:908
+#, python-format
+msgid ""
+"posting a message without model should be with a null res_id (private "
+"message), received %s"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:912
+#, python-format
+msgid ""
+"posting a message without model should be with a parent_id (private message)"
+msgstr ""
+
+#. module: mail
 #: model:ir.model,name:mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "Contrato de garantía del publicador"
@@ -4660,8 +5441,48 @@ msgid "record:"
 msgstr "registro:"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_activity_assigned
+msgid "related to"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:930
+#, python-format
+msgid "reply to missing document (%s,%s)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:923
+#, python-format
+msgid "reply to missing document (%s,%s), fall back on new document creation"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:908
+#, python-format
+msgid "resetting thread_id"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:912
+#: code:addons/mail/models/mail_thread.py:930
+#: code:addons/mail/models/mail_thread.py:933
+#: code:addons/mail/models/mail_thread.py:938
+#: code:addons/mail/models/mail_thread.py:959
+#: code:addons/mail/models/mail_thread.py:963
+#, python-format
+msgid "skipping"
+msgstr "Saltando"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:25
 #, python-format
 msgid "this document"
 msgstr "este documento"
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:901
+#, python-format
+msgid "unknown target model %s"
+msgstr ""