[I18N] Update translation terms from Transifex

10 files changed, 19246 insertions, 20858 deletions

diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po
index 065a45f4099..f820916fc81 100644
--- a/addons/mail/i18n/de.po
+++ b/addons/mail/i18n/de.po
@@ -37,10 +37,10 @@
 # e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.1\n"
+"Project-Id-Version: Odoo Server saas~11.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-13 14:36+0000\n"
-"PO-Revision-Date: 2017-12-13 14:36+0000\n"
+"POT-Creation-Date: 2018-03-22 14:10+0000\n"
+"PO-Revision-Date: 2018-03-22 14:10+0000\n"
 "Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
@@ -50,255 +50,59 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_data_notification_email_default
-msgid ""
-"\n"
-"% set company = ctx.get('company', user.company_id)\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"
-"        <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-"        <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
-"    </div>\n"
-"</div>\n"
-"% endif\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('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('has_button_follow'):\n"
-"        % if ctx.get('has_button_access'):\n"
-"           |\n"
-"        % endif\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=\"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=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
-"        % endfor\n"
-"        % endif\n"
-"    </td>\n"
-"    <td valign=\"center\" align=\"right\">\n"
-"        <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\">\n"
-"    </td>\n"
-"</tr>\n"
-"<tr>\n"
-"    <td colspan=\"2\" style=\"text-align:center;\">\n"
-"        <hr width=\"100%\"\n"
-"            style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
-"        % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
-"        <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n"
-"            <strong>Internal communication</strong>: Replying will post an internal note. Followers won't receive any email notification.\n"
-"        </p>\n"
-"        % endif\n"
-"    </td>\n"
-"</tr>\n"
-"</tbody></table>\n"
-"</div>\n"
-"% endif\n"
-"<div>\n"
-"    ${object.body | safe}\n"
-"</div>\n"
-"% if ctx.get('tracking'):\n"
-"    <ul>\n"
-"    % for tracking in ctx['tracking']\n"
-"        <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
-"    % endfor\n"
-"    </ul>\n"
-"% endif\n"
-"\n"
-"% if ctx.get('signature'):\n"
-"    ${ctx['signature'] | safe}\n"
-"% endif\n"
-"<br/>\n"
-"<p style=\"color: #555555;\">\n"
-"    Sent by\n"
-"    % if ctx.get('website_url'):\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 target=\"_blank\" href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\">Odoo</a>.\n"
-"</p>\n"
-"</div>"
-msgstr ""
-"\n"
-"% set company = ctx.get('company', user.company_id)\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"
-"        <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-"        <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
-"    </div>\n"
-"</div>\n"
-"% endif\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('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('has_button_follow'):\n"
-"        % if ctx.get('has_button_access'):\n"
-"           |\n"
-"        % endif\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=\"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=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
-"        % endfor\n"
-"        % endif\n"
-"    </td>\n"
-"    <td valign=\"center\" align=\"right\">\n"
-"        <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\">\n"
-"    </td>\n"
-"</tr>\n"
-"<tr>\n"
-"    <td colspan=\"2\" style=\"text-align:center;\">\n"
-"        <hr width=\"100%\"\n"
-"            style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
-"        % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
-"        <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n"
-"            <strong>Interne Kommunikation</strong>: Eine Antwort sendet einen internen Hinweis. Follower erhalten keine E-Mail-Benachrichtigung.\n"
-"        </p>\n"
-"        % endif\n"
-"    </td>\n"
-"</tr>\n"
-"</tbody></table>\n"
-"</div>\n"
-"% endif\n"
-"<div>\n"
-"    ${object.body | safe}\n"
-"</div>\n"
-"% if ctx.get('tracking'):\n"
-"    <ul>\n"
-"    % for tracking in ctx['tracking']\n"
-"        <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
-"    % endfor\n"
-"    </ul>\n"
-"% endif\n"
-"\n"
-"% if ctx.get('signature'):\n"
-"    ${ctx['signature'] | safe}\n"
-"% endif\n"
-"<br/>\n"
-"<p style=\"color: #555555;\">\n"
-"    Gesendet von\n"
-"    % if ctx.get('website_url'):\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"
-"    mit\n"
-"    <a target=\"_blank\" href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\">Odoo</a>.\n"
-"</p>\n"
-"</div>"
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:674
+#: code:addons/mail/models/mail_channel.py:680
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr "Dieser Kanal ist privat. Leute müssen dazu eingeladen werden."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_days
-msgid "# Days"
-msgstr "# Tage"
-
-#. 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) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-msgstr ""
-"${object.subject or (object.record_name and 'Betr.: %s' % "
-"object.record_name) or (object.parent_id and object.parent_id.subject and "
-"'Betr.: %s' % object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Betr.: %s' % "
-"object.parent_id.record_name)}"
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:63
+#: code:addons/mail/static/src/js/services/chat_manager.js:1634
 #, python-format
 msgid "%d Messages"
 msgstr "%d Nachrichten"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:31
+#: code:addons/mail/static/src/js/activity.js:88
 #, python-format
 msgid "%d days overdue"
 msgstr "%d Tage überfällig"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:248
+#: code:addons/mail/models/mail_template.py:279
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (Kopie)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:236
+#: code:addons/mail/models/mail_thread.py:234
 #, python-format
 msgid "%s created"
 msgstr "%s erstellt"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:81
+#: code:addons/mail/models/res_users.py:80
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s ist dem %s Netzwerk beigetreten."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:211
 #, python-format
 msgid "&nbsp;("
 msgstr "&nbsp;("
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:179
+#: code:addons/mail/static/src/xml/thread.xml:184
 #, python-format
 msgid "(from"
 msgstr "(von"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,help:mail.field_mail_shortcode__shortcode_type
 msgid ""
 "* Smiley are only used for HTML code to display an image * Text (default "
 "value) is used to substitute text with another text"
@@ -316,7 +120,7 @@ msgstr ", fällig am"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:331
+#: code:addons/mail/static/src/xml/thread.xml:336
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr "-------- Ältere Nachrichten anzeigen --------"
@@ -343,7 +147,7 @@ msgid "0 Today"
 msgstr "0 Heute"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:684
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -359,7 +163,16 @@ msgstr ""
 "            Fügen Sie in Ihre Nachricht vorbereitete Antworten mit <b>:shortcut</b> ein.<br>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:584
+#: code:addons/mail/models/mail_channel.py:507
+#, python-format
+msgid ""
+"<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
+"href=\"#\" class=\"o_channel_redirect\" data-oe-"
+"id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:590
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -369,8 +182,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:508
-#: code:addons/mail/models/mail_channel.py:561
+#: code:addons/mail/models/mail_channel.py:514
+#: code:addons/mail/models/mail_channel.py:567
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -501,6 +314,11 @@ msgstr ""
 "                                    <span class=\"o_stat_text\">Kontext-Aktion</span>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+msgid "<span class=\"oe_inline\">days</span>"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>\n"
@@ -523,6 +341,13 @@ msgid "<strong> Feedback</strong>"
 msgstr "<strong>Feedback</strong>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid ""
+"<strong>Internal communication</strong>: Replying will post an internal "
+"note. Followers won't receive any email notification."
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>Only records checked in list view will be used.</strong><br/>\n"
@@ -537,9 +362,9 @@ msgid "<strong>Recommended Activities</strong>"
 msgstr "<strong>Empfohlene Aktivitäten</strong>"
 
 #. 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_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
 msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
@@ -562,115 +387,118 @@ msgid "Access Groups"
 msgstr "Berechtigungsgruppen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction
 msgid "Action Needed"
 msgstr "Aktion notwendig"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__default
 msgid "Activated by default when subscribing."
 msgstr "Standardmässig aktiviert beim Abonnieren."
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__active
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_search
 msgid "Active"
 msgstr "Aktiv"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__active_domain
 msgid "Active domain"
 msgstr "Aktive Domain"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/systray.xml:87
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_ids
-#: model:ir.model.fields,field_description:mail.field_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.model.fields,field_description:mail.field_account_invoice__activity_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_ids
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
 #: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 #: model:mail.message.subtype,name:mail.mt_activities
@@ -682,7 +510,7 @@ msgstr "Aktivitäten"
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:60
 #: model:ir.model,name:mail.model_mail_activity
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_type_id
+#: 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
@@ -696,6 +524,32 @@ msgid "Activity Mixin"
 msgstr "Aktivität Mixin"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_state
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_state
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_state
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_state
+msgid "Activity State"
+msgstr "Status der Aktivität"
+
+#. 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"
@@ -717,7 +571,7 @@ msgstr "Aktivitätstyp"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:87
+#: code:addons/mail/static/src/xml/discuss.xml:87
 #, python-format
 msgid "Add"
 msgstr "Hinzufügen"
@@ -725,7 +579,7 @@ msgstr "Hinzufügen"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:64
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_channel_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__channel_ids
 #, python-format
 msgid "Add Channels"
 msgstr "Kanäle hinzufügen"
@@ -733,7 +587,7 @@ msgstr "Kanäle hinzufügen"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:61
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_partner_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
 msgid "Add Followers"
@@ -748,22 +602,28 @@ msgstr ""
 "werden"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,field_description:mail.field_mail_template_user_signature
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,field_description:mail.field_mail_template__user_signature
 msgid "Add Signature"
 msgstr "Signatur hinzufügen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:41
-#: code:addons/mail/static/src/xml/client_action.xml:186
+#: code:addons/mail/static/src/xml/discuss.xml:41
+#: code:addons/mail/static/src/xml/discuss.xml:186
 #, python-format
 msgid "Add a channel"
 msgstr "Einen Kanal hinzufügen"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:335
+#, python-format
+msgid "Add a new %(document)s or send an email to %(email_link)s"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:60
+#: code:addons/mail/static/src/xml/discuss.xml:60
 #, python-format
 msgid "Add a private channel"
 msgstr "Privaten Kanal hinzufügen"
@@ -780,7 +640,7 @@ msgid "Add contacts to notify..."
 msgstr "Kontakte als Empfänger hinzufügen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
 msgid "Additional Contacts"
 msgstr "Weitere Kontakte"
 
@@ -795,45 +655,45 @@ msgid "Advanced Settings"
 msgstr "Erweiterte Einstellungen"
 
 #. 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_res_users_alias_id
+#: 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_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
 msgid "Alias"
 msgstr "Alias"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_contact
+#: 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
+#: model:ir.model.fields,field_description:mail.field_res_users__alias_contact
 msgid "Alias Contact Security"
 msgstr "Aliaskontakt-Sicherheit"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__alias_domain
 msgid "Alias Domain"
 msgstr "Alias-Domäne"
 
 #. module: mail
-#: 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_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
 msgid "Alias Name"
 msgstr "Alias-Name"
 
 #. module: mail
-#: 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_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
 msgid "Alias domain"
 msgstr "Alias-Domäne"
 
 #. module: mail
-#: 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_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
 msgid "Aliased Model"
 msgstr "Alias-Modell"
 
@@ -858,16 +718,16 @@ msgstr "Immer"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:198
+#: code:addons/mail/static/src/js/services/chat_manager.js:1328
 #, python-format
 msgid "Anonymous"
 msgstr "Anonym"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__no_auto_thread
 msgid ""
 "Answers do not go in the original document discussion thread. This has an "
 "impact on the generated message-id."
@@ -876,8 +736,8 @@ msgstr ""
 "hat Auswirkungen auf die generierte Message-ID."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_id
 msgid "Applies to"
 msgstr "Gilt für"
 
@@ -889,9 +749,14 @@ msgid "Apply"
 msgstr "Anwenden"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+msgid "Archived"
+msgstr "Archiviert"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:45
-#: model:ir.model.fields,field_description:mail.field_mail_activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
 #, python-format
 msgid "Assigned to"
 msgstr "Zugewiesen an"
@@ -902,19 +767,19 @@ msgid "Attach a file"
 msgstr "Eine Datei anhängen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_template__attachment_ids
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Attachments"
 msgstr "Dateianhänge"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_message_attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_message__attachment_ids
 msgid ""
 "Attachments are linked to a document through model / res_id and to the "
 "message through this field."
@@ -933,10 +798,10 @@ msgid "Authenticated Partners"
 msgstr "Authentifizierte Partner"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_id
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Author"
 msgstr "Autor"
@@ -947,10 +812,10 @@ msgid "Author Signature (mass mail only)"
 msgstr "Verfassersignatur (nur Massenmail)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,help:mail.field_mail_mail_author_id
-#: model:ir.model.fields,help:mail.field_mail_message_author_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,help:mail.field_mail_mail__author_id
+#: model:ir.model.fields,help:mail.field_mail_message__author_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_id
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that"
 " did not match any partner."
@@ -959,27 +824,27 @@ msgstr ""
 "Adresse enthalten, die keinem Partner zugeordnet werden kann."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_avatar
 msgid "Author's avatar"
 msgstr "Avatar des Autors"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_public_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_public_id
 msgid "Authorized Group"
 msgstr "Berechtigte Gruppe"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_template__auto_delete
 msgid "Auto Delete"
 msgstr "Autom. Löschen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_ids
 msgid "Auto Subscription"
 msgstr "Automatisches Abonnement"
 
@@ -1002,16 +867,16 @@ msgstr ""
 "Seien Sie vorsichtig mit Kanälen, die interne Benachrichtigungen beobachten"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
-#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
 msgid "Body"
 msgstr "Nachrichtentext"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,field_description:mail.field_res_users_message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_users__message_bounce
 msgid "Bounce"
 msgstr "Unzustellbar"
 
@@ -1057,34 +922,34 @@ msgid "Canned Response / Shortcode"
 msgstr "Vorbereitete Antwort / Kürzel"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_cc
+#: model:ir.model.fields,help:mail.field_mail_mail__email_cc
 msgid "Carbon copy message recipients"
 msgstr "CC-Nachrichten-Empfänger"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,help:mail.field_mail_template_email_cc
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,help:mail.field_mail_template__email_cc
 msgid "Carbon copy recipients (placeholders may be used here)"
 msgstr "CC-Empfänger  (Platzhalter können verwendet werden)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,help:mail.field_mail_activity_type_category
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,help:mail.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
 msgstr ""
 "Kategorien können spezifische Aktionen, wie das Öffnen der Kalenderansicht, "
 "auslösen."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__category
 msgid "Category"
 msgstr "Kategorie"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_cc
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_cc
 msgid "Cc"
 msgstr "CC"
 
@@ -1094,40 +959,40 @@ msgid "Change"
 msgstr "Wechselgeld"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field
 msgid "Changed Field"
 msgstr "Geändertes Feld"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
 #: selection:mail.channel,channel_type:0
 msgid "Channel"
 msgstr "Kanal"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_message_ids
 msgid "Channel Message"
 msgstr "Kanal-Mitteilung"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_type
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_type
 msgid "Channel Type"
 msgstr "Kanaltyp"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:36
-#: code:addons/mail/static/src/xml/client_action.xml:172
+#: code:addons/mail/static/src/xml/discuss.xml:36
+#: code:addons/mail/static/src/xml/discuss.xml:172
 #: code:addons/mail/static/src/xml/systray.xml:19
 #: code:addons/mail/static/src/xml/systray.xml:36
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__channel_ids
 #: model:ir.ui.menu,name:mail.mail_channel_menu_settings
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
 #, python-format
@@ -1142,7 +1007,7 @@ msgstr "Gruppen/Partner"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:168
+#: code:addons/mail/static/src/xml/discuss.xml:168
 #: code:addons/mail/static/src/xml/systray.xml:18
 #: code:addons/mail/static/src/xml/systray.xml:32
 #: model:ir.actions.client,name:mail.mail_channel_action_client_chat
@@ -1161,10 +1026,10 @@ msgid "Chat Shortcode"
 msgstr "Chat Kurzbefehl"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__child_ids
 msgid "Child Messages"
 msgstr "Kommentare"
 
@@ -1174,25 +1039,6 @@ msgid "Choose an example"
 msgstr "Wählen Sie ein Beispiel"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:342
-#, python-format
-msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
-msgstr ""
-"Klicken Sie hier, um neue %(document)s anzulegen, oder ein E-Mail an "
-"%(email_link)s zu senden"
-
-#. module: mail
-#: code:addons/mail/models/mail_thread.py:358
-#, python-format
-msgid "Click here to add new %s"
-msgstr "Klicken Sie hier, um %s neu hinzuzufügen"
-
-#. module: mail
-#: model:ir.actions.act_window,help:mail.mail_shortcode_action
-msgid "Click to define a new chat shortcode."
-msgstr "Klicken Sie hier, um einen neuen Chat-Kurzbefehl hinzuzufügen."
-
-#. module: mail
 #: selection:mail.channel.partner,fold_state:0
 msgid "Closed"
 msgstr "Abgeschlossen"
@@ -1208,8 +1054,8 @@ msgid "Comma-separated ids of recipient partners"
 msgstr "Komma separierte ID's Liste der Emailempfänger"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_partner_to
-#: model:ir.model.fields,help:mail.field_mail_template_partner_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr ""
@@ -1222,8 +1068,8 @@ msgid "Comma-separated recipient addresses"
 msgstr "Komma separierte Emailempfängeradressen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,help:mail.field_mail_template_email_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,help:mail.field_mail_template__email_to
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr ""
 "Komma-getrennte Empfängeradressen (Platzhalter können verwendet werden)"
@@ -1243,8 +1089,8 @@ msgid "Compose Email"
 msgstr "E-Mail schreiben"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_composition_mode
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__composition_mode
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__composition_mode
 msgid "Composition mode"
 msgstr "Schreibmodus"
 
@@ -1255,14 +1101,14 @@ msgstr "Aktivitätstypen konfigurieren"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:109
+#: code:addons/mail/static/src/xml/thread.xml:114
 #, python-format
 msgid "Congratulations, your inbox is empty"
 msgstr "Herzlichen Glückwunsch. Ihr Posteingang ist leer."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:647
+#: code:addons/mail/static/src/js/discuss.js:662
 #, python-format
 msgid "Congratulations, your inbox is empty!"
 msgstr "Herzlichen Glückwunsch. Ihr Posteingang ist leer."
@@ -1279,20 +1125,20 @@ msgid "Content"
 msgstr "Inhalt"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_body
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body
-#: model:ir.model.fields,field_description:mail.field_mail_message_body
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_body
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__body
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body
+#: model:ir.model.fields,field_description:mail.field_mail_message__body
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__body
 msgid "Contents"
 msgstr "Inhalte"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_fold_state
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__fold_state
 msgid "Conversation Fold State"
 msgstr "Konversation in eingeklapptem Status"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_minimized
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_minimized
 msgid "Conversation is minimized"
 msgstr "Das Unterhaltung wird minimiert"
 
@@ -1304,64 +1150,70 @@ msgid "Conversations"
 msgstr "Konversationen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,help:mail.field_res_users_message_bounce
+#: model:ir.model.fields,help:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,help:mail.field_res_users__message_bounce
 msgid "Counter of the number of bounced emails for this contact"
 msgstr "Zähler der unzustellbaren Emails für diesen Kontakt"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:307
+#: code:addons/mail/static/src/js/discuss.js:318
 #, python-format
 msgid "Create %s"
 msgstr "%s erstellen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__create_date
 msgid "Create Date"
 msgstr "Erstellt am"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:350
+#, python-format
+msgid "Create a new %(document)s"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Created By"
 msgstr "Angelegt von"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_uid
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_uid
 msgid "Created by"
 msgstr "Erstellt von"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:41
-#: 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
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_date
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_date
 #, python-format
 msgid "Created on"
 msgstr "Erstellt am"
@@ -1372,90 +1224,22 @@ msgid "Creation Month"
 msgstr "Erstellungsmonat"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,help:mail.field_mail_mail_starred
-#: model:ir.model.fields,help:mail.field_mail_message_starred
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_starred
+#: model:ir.model.fields,help:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,help:mail.field_mail_mail__starred
+#: model:ir.model.fields,help:mail.field_mail_message__starred
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__starred
 msgid "Current user has a starred notification linked to this message"
 msgstr "Dieser Benutzer hat eine Markierung zu dieser Nachricht erstellt"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_date
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__date
+#: model:ir.model.fields,field_description:mail.field_mail_message__date
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__date
 msgid "Date"
 msgstr "Datum"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,help:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,help:mail.field_event_event_message_last_post
-#: model:ir.model.fields,help:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,help:mail.field_event_track_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_track_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
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,help:mail.field_note_note_message_last_post
-#: model:ir.model.fields,help:mail.field_product_product_message_last_post
-#: model:ir.model.fields,help:mail.field_product_template_message_last_post
-#: model:ir.model.fields,help:mail.field_project_project_message_last_post
-#: model:ir.model.fields,help:mail.field_project_task_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,help:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,help:mail.field_res_users_message_last_post
-#: model:ir.model.fields,help:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,help:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr "Datum der letzten Nachricht für diesen Datensatz."
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Deadline"
 msgstr "Frist"
@@ -1466,32 +1250,32 @@ msgid "Dear"
 msgstr "Hallo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__default
 msgid "Default"
 msgstr "Standard"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,field_description:mail.field_mail_template_null_value
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,field_description:mail.field_mail_template__null_value
 msgid "Default Value"
 msgstr "Standardwert"
 
 #. module: mail
-#: 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_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
 msgid "Default Values"
 msgstr "Standardeinstellungen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__use_default_to
 msgid "Default recipients"
 msgstr "Standardempfänger"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,help:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,help:mail.field_mail_template__use_default_to
 msgid ""
 "Default recipients of the record:\n"
 "- partner (using id on a partner or the partner_id field) OR\n"
@@ -1502,26 +1286,31 @@ msgstr ""
 "- E-Mail (durch Verwendung der Felder email_from oder email)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.actions.act_window,help:mail.mail_shortcode_action
+msgid "Define a new chat shortcode"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete Emails"
 msgstr "E-Mails löschen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete_message
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete_message
 msgid "Delete Message Copy"
 msgstr "Nachrichtenkopie löschen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete sent emails (mass mailing only)"
 msgstr "Gesendete E-Mails löschen (nur Massenmailing)"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:320
+#: code:addons/mail/static/src/xml/thread.xml:325
 #, python-format
 msgid "Delete this attachment"
 msgstr "Diesen Anhang löschen"
@@ -1532,15 +1321,15 @@ msgid "Delivery Failed"
 msgstr "Versand gescheitert"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_description
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_description
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_description
+#: model:ir.model.fields,field_description:mail.field_mail_channel__description
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__description
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__description
 #: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
 msgid "Description"
 msgstr "Beschreibung"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_description
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__description
 msgid ""
 "Description that will be added in the message posted for this subtype. If "
 "void, the name will be added instead."
@@ -1550,7 +1339,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:46
+#: code:addons/mail/static/src/xml/discuss.xml:46
 #, python-format
 msgid "Direct Messages"
 msgstr "Direkte Nachrichten"
@@ -1581,26 +1370,26 @@ msgid "Discussions"
 msgstr "Diskussionen"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_display_name
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__display_name
+#: 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_subtype__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_notification__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_thread__display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__display_name
 msgid "Display Name"
 msgstr "Anzeigename"
 
@@ -1612,13 +1401,13 @@ msgid ""
 msgstr "Anzeige einer Option, einen Assistenten zu finden."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_res_name
+#: model:ir.model.fields,help:mail.field_mail_activity__res_name
 msgid "Display name of the related document."
 msgstr "Anzeigename des zugehörigen Dokuments."
 
 #. 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
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete_message
 msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
@@ -1632,7 +1421,12 @@ msgid "Document Followers"
 msgstr "Dokument Abonnenten"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_name
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_model_id
+msgid "Document Model"
+msgstr "Dokumentenmodell"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_name
 msgid "Document Name"
 msgstr "Dokumenten Name"
 
@@ -1653,28 +1447,28 @@ msgstr "Fertig und nächstes Element planen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:296
+#: code:addons/mail/static/src/xml/thread.xml:301
 #, python-format
 msgid "Download this PDF"
 msgstr "Dieses PDF runterladen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:272
-#: code:addons/mail/static/src/xml/thread.xml:285
-#: code:addons/mail/static/src/xml/thread.xml:308
+#: code:addons/mail/static/src/xml/thread.xml:277
+#: code:addons/mail/static/src/xml/thread.xml:290
+#: code:addons/mail/static/src/xml/thread.xml:313
 #, python-format
 msgid "Download this attachment"
 msgstr "Diesen Anhang runterladen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity__date_deadline
 msgid "Due Date"
 msgstr "Fälligkeit"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:37
+#: code:addons/mail/static/src/js/activity.js:94
 #, python-format
 msgid "Due in %d days"
 msgstr "In %d Tagen fällig"
@@ -1706,7 +1500,7 @@ msgid "Edit subscription"
 msgstr "Bearbeite Anmeldung"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_email
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_email
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 #: model:mail.activity.type,name:mail.mail_activity_data_email
 #: selection:mail.compose.message,message_type:0
@@ -1741,12 +1535,12 @@ msgid "Email Search"
 msgstr "E-Mail Suche"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_email_status
+#: model:ir.model.fields,field_description:mail.field_mail_notification__email_status
 msgid "Email Status"
 msgstr "E-Mail Status"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__template_id
 msgid "Email Template"
 msgstr "E-Mail Vorlage"
 
@@ -1766,7 +1560,7 @@ msgid "Email Thread"
 msgstr "E-Mail Thread"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_alias_id
+#: model:ir.model.fields,help:mail.field_res_users__alias_id
 msgid ""
 "Email address internally associated with this user. Incoming emails will "
 "appear in the user's notifications."
@@ -1775,10 +1569,10 @@ msgstr ""
 "Benachrichtigungen des Benutzers anzgeigt."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_email_from
-#: model:ir.model.fields,help:mail.field_mail_mail_email_from
-#: model:ir.model.fields,help:mail.field_mail_message_email_from
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,help:mail.field_mail_compose_message__email_from
+#: model:ir.model.fields,help:mail.field_mail_mail__email_from
+#: model:ir.model.fields,help:mail.field_mail_message__email_from
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__email_from
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found and replaces the author_id field in the chatter."
@@ -1817,7 +1611,7 @@ msgstr ""
 "Es ist ein Fehler bei der Kommunikation mit dem Wartungsserver aufgetreten."
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:302
+#: code:addons/mail/models/mail_mail.py:300
 #, python-format
 msgid ""
 "Error without exception. Probably due do sending an email without computed "
@@ -1860,7 +1654,7 @@ msgid "Extended Filters..."
 msgstr "Erweiterte Filter..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_fail_counter
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__fail_counter
 msgid "Fail Mail"
 msgstr "Fehlgeschlagene E-Mails"
 
@@ -1870,19 +1664,19 @@ msgid "Failed"
 msgstr "Fehlgeschlagen"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:374
+#: code:addons/mail/models/mail_template.py:368
 #, python-format
 msgid "Failed to render template %r using values %r"
 msgstr "Fehler beim Erstellen der Vorlage %r mit den Werten %r"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,field_description:mail.field_mail_mail__failure_reason
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Failure Reason"
 msgstr "Fehlerursache"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
 msgid ""
 "Failure reason. This is usually the exception thrown by the email server, "
 "stored to ease the debugging of mailing issues."
@@ -1891,45 +1685,45 @@ msgstr ""
 "gespeichert wird, um die E-Mail-Fehlersuche zu erleichtern."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred_partner_ids
 msgid "Favorited By"
 msgstr "Favorisiert von"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:215
-#: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
+#: code:addons/mail/static/src/js/activity.js:245
+#: model:ir.model.fields,field_description:mail.field_mail_activity__feedback
 #, python-format
 msgid "Feedback"
 msgstr "Feedback"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_object_field
 msgid "Field"
 msgstr "Feld"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:24
+#: code:addons/mail/models/ir_model.py:30
 #, python-format
 msgid "Field \"Mail Thread\" cannot be changed to \"False\"."
 msgstr "Das Feld „E-Mail-Thread“ kann nicht in „Falsch“ geändert werden."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_desc
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_desc
 msgid "Field Description"
 msgstr "Feld Beschreibung"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_type
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_type
 msgid "Field Type"
 msgstr "Typfeld-Text"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__relation_field
 msgid ""
 "Field used to link the related model to the subtype model when using "
 "automatic subscription on a related document. The field is used to compute "
@@ -1945,8 +1739,8 @@ msgid "Fields"
 msgstr "Felder"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,help:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,help:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,help:mail.field_mail_template__copyvalue
 msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
@@ -1961,7 +1755,6 @@ msgstr "Zusammen gefaltet"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:696
 #: code:addons/mail/static/src/xml/followers.xml:20
 #, python-format
 msgid "Follow"
@@ -1969,208 +1762,211 @@ msgstr "Abonnieren"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_followers
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_follower_ids
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: model:ir.ui.view,arch_db:mail.view_followers_tree
 msgid "Followers"
 msgstr "Abonnenten"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_channel_ids
 msgid "Followers (Channels)"
 msgstr "Abonnenten (Kanäle)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_partner_ids
 msgid "Followers (Partners)"
 msgstr "Abonnenten (Partner)"
 
@@ -2199,18 +1995,18 @@ msgid "Following"
 msgstr "Abonniert"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_icon
-#: model:ir.model.fields,help:mail.field_mail_activity_type_icon
+#: 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 "Font für großartiges Icon, z.B. fa-tasks "
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_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
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_from
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_from
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__email_from
 msgid "From"
 msgstr "Von"
 
@@ -2233,7 +2029,7 @@ msgid "Gateway"
 msgstr "Gateway"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:55
+#: code:addons/mail/models/res_users.py:54
 #, python-format
 msgid "Go to the configuration panel"
 msgstr "Benutzen Sie das Hauptmenü"
@@ -2276,49 +2072,54 @@ msgid "Has attachments"
 msgstr "Enthält Anhänge"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_headers
+#: model:ir.model.fields,field_description:mail.field_mail_mail__headers
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Headers"
 msgstr "Kopftexte"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_hidden
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Hello"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
 msgid "Hidden"
 msgstr "Versteckt"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_hidden
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__hidden
 msgid "Hide the subtype in the follower options"
 msgstr "Verberge den Untertyp in den Abonnenten Optionen"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_id
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__id
+#: 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_subtype__id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__id
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__id
+#: model:ir.model.fields,field_description:mail.field_mail_template__id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__id
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mail
-#: 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_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
 msgid ""
 "ID of the parent record holding the alias (example: project holding the task"
 " creation alias)"
@@ -2327,163 +2128,165 @@ msgstr ""
 "für die Erstellung von Aufgaben beinhaltet)."
 
 #. 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
+#: 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 "Icon"
 
 #. 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
+#: 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"
 msgstr "Id der verfolgten Ressource"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:119
-#: code:addons/mail/static/src/xml/client_action.xml:203
+#: code:addons/mail/static/src/xml/discuss.xml:119
+#: code:addons/mail/static/src/xml/discuss.xml:203
 #, python-format
 msgid "Idle"
 msgstr "ungenutzt"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,help:mail.field_event_event_message_unread
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread
-#: model:ir.model.fields,help:mail.field_event_track_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,help:mail.field_note_note_message_unread
-#: model:ir.model.fields,help:mail.field_product_product_message_unread
-#: model:ir.model.fields,help:mail.field_product_template_message_unread
-#: model:ir.model.fields,help:mail.field_project_project_message_unread
-#: model:ir.model.fields,help:mail.field_project_task_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread
-#: model:ir.model.fields,help:mail.field_res_users_message_unread
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,help:mail.field_event_event__message_unread
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread
+#: model:ir.model.fields,help:mail.field_event_track__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,help:mail.field_note_note__message_unread
+#: model:ir.model.fields,help:mail.field_product_product__message_unread
+#: model:ir.model.fields,help:mail.field_product_template__message_unread
+#: model:ir.model.fields,help:mail.field_project_project__message_unread
+#: model:ir.model.fields,help:mail.field_project_task__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread
+#: model:ir.model.fields,help:mail.field_res_users__message_unread
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread
 msgid "If checked new messages require your attention."
 msgstr "Falls markiert, benötigen neue Nachrichten Ihre Kenntnisnahme."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,help:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction
 msgid "If checked, new messages require your attention."
 msgstr "Falls markiert, benötigen neue Nachrichten Ihre Kenntnisnahme."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
 msgid ""
 "If checked, the partners will receive an email warning they have been added "
 "in the document's followers."
@@ -2492,8 +2295,8 @@ msgstr ""
 "Abonnent zu einem Dokument hinzugefügt wurden."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,help:mail.field_mail_template_user_signature
+#: model:ir.model.fields,help:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,help:mail.field_mail_template__user_signature
 msgid ""
 "If checked, the user's signature will be appended to the text version of the"
 " message"
@@ -2502,8 +2305,8 @@ msgstr ""
 "Nachricht angehängt"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_opt_out
-#: model:ir.model.fields,help:mail.field_res_users_opt_out
+#: model:ir.model.fields,help:mail.field_res_partner__opt_out
+#: model:ir.model.fields,help:mail.field_res_users__opt_out
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails for mass "
 "mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
@@ -2514,7 +2317,7 @@ msgstr ""
 " dem Benutzer die Partner entsprechend zu heraus zu filtern."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_mail__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible."
@@ -2524,8 +2327,8 @@ msgstr ""
 "wie möglich gesendet."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_scheduled_date
-#: model:ir.model.fields,help:mail.field_mail_template_scheduled_date
+#: model:ir.model.fields,help:mail.field_email_template_preview__scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_template__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible. Jinja2 placeholders may be used."
@@ -2535,7 +2338,7 @@ msgstr ""
 "wie möglich gesendet. Jinja2-Platzhalter können verwendet werden."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
 msgid ""
 "If you have setup a catch-all email domain redirected to the Odoo server, "
 "enter the domain name here."
@@ -2544,26 +2347,26 @@ msgstr ""
 "hier die Domain an."
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:141
+#: code:addons/mail/models/mail_alias.py:130
 #, python-format
 msgid "Inactive Alias"
 msgstr "Inaktiver Alias"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:655
-#: code:addons/mail/static/src/xml/client_action.xml:22
-#: code:addons/mail/static/src/xml/client_action.xml:154
-#: code:addons/mail/static/src/xml/client_action.xml:164
+#: code:addons/mail/static/src/js/services/chat_manager.js:84
+#: code:addons/mail/static/src/xml/discuss.xml:22
+#: code:addons/mail/static/src/xml/discuss.xml:154
+#: code:addons/mail/static/src/xml/discuss.xml:164
 #, python-format
 msgid "Inbox"
 msgstr "Eingang"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,help:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,help:mail.field_mail_message_parent_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,help:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,help:mail.field_mail_message__parent_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__parent_id
 msgid "Initial thread message."
 msgstr "Nachricht zur Begrüßung in dieser Gruppe"
 
@@ -2574,12 +2377,12 @@ msgid "Integrations"
 msgstr "Integration"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__internal
 msgid "Internal Only"
 msgstr "Nur interne"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:99
+#: code:addons/mail/models/mail_alias.py:88
 #, python-format
 msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
@@ -2589,7 +2392,8 @@ msgstr ""
 "werden, z.B. \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1794
+#: code:addons/mail/models/mail_thread.py:1811
+#: code:addons/mail/models/mail_thread.py:1996
 #, python-format
 msgid ""
 "Invalid record set: should be called as model (without records) or on "
@@ -2599,14 +2403,14 @@ msgstr ""
 "Einzeldatensatz aufgerufen werden"
 
 #. module: mail
-#: code:addons/mail/controllers/main.py:41
+#: code:addons/mail/controllers/main.py:40
 #, python-format
 msgid "Invalid token in route %s"
 msgstr "Ungültiger Token auf Route %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "Invitation"
 msgstr "Einladung"
@@ -2619,8 +2423,8 @@ msgstr "Abonnieren Sie  %s: %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:44
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:44
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite"
 msgstr "Einladen"
@@ -2634,15 +2438,15 @@ msgstr "Abonnenten einladen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:31
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:29
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite people"
 msgstr "Personen einladen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:867
+#: code:addons/mail/static/src/js/discuss.js:882
 #, python-format
 msgid "Invite people to #%s"
 msgstr "Personen zu #%s einladen"
@@ -2658,95 +2462,96 @@ msgid "Invited people only"
 msgstr "Nur eingeladene Personen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_note_note_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_product_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_template_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_project_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_task_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_users_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_note_note__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_product__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_template__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_project__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_task__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_users__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_is_follower
 msgid "Is Follower"
 msgstr "Ist ein Abonnent"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification
+#: model:ir.model.fields,field_description:mail.field_mail_mail__notification
 msgid "Is Notification"
 msgstr "Ist Benachrichtigung"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_read
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_read
 msgid "Is Read"
 msgstr "Ist gelesen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_subscribed
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_subscribed
 msgid "Is Subscribed"
 msgstr "Wird abonniert"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_member
 msgid "Is a member"
 msgstr "Ist ein Miglied"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
 msgid "Is pinned on the interface"
 msgstr "Wurde auf der Oberfläche hinterlegt"
 
@@ -2761,144 +2566,76 @@ msgid "Join a group"
 msgstr "Gruppe beitreten"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_lang
-#: model:ir.model.fields,field_description:mail.field_mail_template_lang
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__lang
+#: model:ir.model.fields,field_description:mail.field_mail_template__lang
 msgid "Language"
 msgstr "Sprache"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_track_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_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_test_simple_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_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
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,field_description:mail.field_note_note_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_product_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_template_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_project_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_task_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_users_message_last_post
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_last_post
-msgid "Last Message Date"
-msgstr "Datum der letzten Nachricht"
-
-#. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner___last_update
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message___last_update
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract___last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message____last_update
+#: 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_subtype____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_notification____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_template____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_thread____last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract____last_update
 msgid "Last Modified on"
 msgstr "Zuletzt geändert am"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_last_seen_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_seen_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_last_seen_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__seen_message_id
 msgid "Last Seen"
 msgstr "Zuletzt gesichtet am"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_uid
-#: 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_tracking_value_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_uid
 msgid "Last Updated by"
 msgstr "Zuletzt aktualisiert durch"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_date
-#: 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_tracking_value_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_date
 msgid "Last Updated on"
 msgstr "Zuletzt aktualisiert am"
 
@@ -2922,14 +2659,14 @@ msgstr "Urlaub"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:687
-#: code:addons/mail/static/src/xml/client_action.xml:112
+#: code:addons/mail/models/mail_channel.py:693
+#: code:addons/mail/static/src/xml/discuss.xml:112
 #, python-format
 msgid "Leave this channel"
 msgstr "Kanal verlassen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_channel_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__channel_ids
 msgid ""
 "List of channels that will be added as listeners of the current document."
 msgstr ""
@@ -2937,7 +2674,7 @@ msgstr ""
 "werden."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__partner_ids
 msgid ""
 "List of partners that will be added as follower of the current document."
 msgstr ""
@@ -2945,18 +2682,18 @@ msgstr ""
 "werden."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:698
+#: code:addons/mail/models/mail_channel.py:704
 #, python-format
 msgid "List users in the current channel"
 msgstr "Benutzer im aktuellen Channel auflisten"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__channel_id
 msgid "Listener"
 msgstr "Zuhörer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_partner_ids
 msgid "Listeners"
 msgstr "Zuhörer"
 
@@ -2972,7 +2709,7 @@ msgstr "Livechat Verlauf"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:31
+#: code:addons/mail/static/src/js/chatter_composer.js:30
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Log"
@@ -2996,8 +2733,8 @@ msgid "Log an Activity"
 msgstr "Aktivität erfassen"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__is_log
 msgid "Log an Internal Note"
 msgstr "Interne Notiz erfassen"
 
@@ -3016,10 +2753,10 @@ msgid "Log or schedule an activity"
 msgstr "Aktivität loggen oder planen"
 
 #. 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
+#: 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 "E-Mail-Aktivitätstyp"
 
@@ -3029,13 +2766,13 @@ msgid "Mail Channel Form"
 msgstr "Formular für E-Mail-Kanal"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:369
+#: code:addons/mail/models/mail_mail.py:367
 #, python-format
 msgid "Mail Delivery Failed"
 msgstr "Der E-Mail-Versand ist gescheitert"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,field_description:mail.field_ir_model__is_mail_thread
 #: model:ir.ui.view,arch_db:mail.model_search_view
 msgid "Mail Thread"
 msgstr "E-Mail-Thread"
@@ -3046,7 +2783,7 @@ msgid "Mail Tracking Value"
 msgstr "Wert für E-Mail-Verfolgung"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_notification
+#: model:ir.model.fields,help:mail.field_mail_mail__notification
 msgid "Mail has been created to notify people of an existing mail.message"
 msgstr ""
 "Es wurde ein E-Mail Hinweis für eine existierende E-Mail Benachrichtigung "
@@ -3060,7 +2797,7 @@ msgid "Mail: Email Queue Manager"
 msgstr "E-Mail: E-Mail-Manager für Warteschlange"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:832
+#: code:addons/mail/models/mail_thread.py:813
 #, python-format
 msgid "Mailbox unavailable - %s"
 msgstr "Mailbox nicht verfügbar –  %s"
@@ -3079,14 +2816,14 @@ msgstr "Als erledigt markieren"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all as read"
 msgstr "Als gelesen markieren"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all read"
 msgstr "Alle als gelesen markieren"
@@ -3098,15 +2835,15 @@ msgstr "Als erledigt markieren"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:206
+#: code:addons/mail/static/src/xml/thread.xml:211
 #, python-format
 msgid "Mark as Read"
 msgstr "Als gelesen markieren"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:153
-#: code:addons/mail/static/src/xml/thread.xml:200
+#: code:addons/mail/static/src/xml/thread.xml:158
+#: code:addons/mail/static/src/xml/thread.xml:205
 #, python-format
 msgid "Mark as Todo"
 msgstr "Als zu erledigen markieren"
@@ -3119,12 +2856,12 @@ msgid "Mark as done"
 msgstr "Als fertig makieren"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_medium
 msgid "Medium-sized photo"
 msgstr "Bild mittlerer Größe"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,help:mail.field_mail_channel__image_medium
 msgid ""
 "Medium-sized photo of the group. It is automatically resized as a 128x128px "
 "image, with aspect ratio preserved. Use this field in form views or some "
@@ -3146,7 +2883,7 @@ msgid "Members"
 msgstr "Mitglieder"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,help:mail.field_mail_channel__group_ids
 msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
@@ -3156,16 +2893,22 @@ msgstr ""
 "bearbeiten können."
 
 #. module: mail
+#: code:addons/mail/wizard/base_partner_merge.py:13
+#, python-format
+msgid "Merged with the following partners:"
+msgstr "Zusammengeführt mit diesen Partnern:"
+
+#. 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.model.fields,field_description:mail.field_mail_mail__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Message"
 msgstr "Nachricht"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
 msgid "Message ID"
 msgstr "Nachrichten ID"
 
@@ -3175,37 +2918,37 @@ msgid "Message Notifications"
 msgstr "Mitteilungsbenachrichtigungen"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_mail__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_message__record_name
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__record_name
 msgid "Message Record Name"
 msgstr "Nachrichtenname"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__name
 msgid "Message Type"
 msgstr "Mitteilungstyp"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_to
+#: model:ir.model.fields,help:mail.field_mail_mail__email_to
 msgid "Message recipients (emails)"
 msgstr "Nachrichtenempfänger (E-Mails)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_references
+#: model:ir.model.fields,help:mail.field_mail_mail__references
 msgid "Message references, such as identifiers of previous messages"
 msgstr "Nachricht Referenzen, wie z. B. Kennungen von vorherigen Nachrichten"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
+#: code:addons/mail/static/src/xml/discuss.xml:124
 #, python-format
 msgid "Message sent in \""
 msgstr "Mitteilung gesendet in \""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__name
 msgid ""
 "Message subtype gives a more precise type on the message, especially for "
 "system notifications. For example, it can be a notification related to a new"
@@ -3222,7 +2965,7 @@ msgid "Message subtypes"
 msgstr "Nachrichten-Subtyp"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_followers_subtype_ids
+#: model:ir.model.fields,help:mail.field_mail_followers__subtype_ids
 msgid ""
 "Message subtypes followed, meaning subtypes that will be pushed onto the "
 "user's Wall."
@@ -3231,10 +2974,10 @@ msgstr ""
 "angezeigt wird."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,help:mail.field_mail_mail_message_type
-#: model:ir.model.fields,help:mail.field_mail_message_message_type
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,help:mail.field_mail_mail__message_type
+#: model:ir.model.fields,help:mail.field_mail_message__message_type
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_type
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
@@ -3243,87 +2986,88 @@ msgstr ""
 " Kommentar für andere Mitteilungen wie Diskussionsbeiträge von Benutzern."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,help:mail.field_mail_mail_message_id
-#: model:ir.model.fields,help:mail.field_mail_message_message_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,help:mail.field_mail_mail__message_id
+#: model:ir.model.fields,help:mail.field_mail_message__message_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_id
 msgid "Message unique identifier"
 msgstr "Eindeutige Identifikation der Nachricht"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_id
 msgid "Message-Id"
 msgstr "Nachricht-ID"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_ids
 #: model:ir.ui.menu,name:mail.menu_mail_message
 #: model:ir.ui.view,arch_db:mail.view_message_tree
 msgid "Messages"
@@ -3344,7 +3088,7 @@ msgstr ""
 "zu erinnern."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__internal
 msgid ""
 "Messages with internal subtypes will be visible only by employees, aka "
 "members of base_user group"
@@ -3353,20 +3097,20 @@ msgstr ""
 "Mitglieder der base_user Gruppe"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_res_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_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
 msgid "Model"
 msgstr "Modell"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_res_model
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__res_model
 msgid "Model of the followed resource"
 msgstr "Modell der verfolgten Ressource"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__res_model
 msgid ""
 "Model the subtype applies to. If False, this subtype applies to all models."
 msgstr ""
@@ -3395,25 +3139,25 @@ msgid "My Activities"
 msgstr "Meine Aktivitäten"
 
 #. 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_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.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Name"
 msgstr "Name"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_record_name
-#: model:ir.model.fields,help:mail.field_mail_mail_record_name
-#: model:ir.model.fields,help:mail.field_mail_message_record_name
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,help:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,help:mail.field_mail_mail__record_name
+#: model:ir.model.fields,help:mail.field_mail_message__record_name
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__record_name
 msgid "Name get of the related document."
 msgstr "Bezeichnung kommt vom verbundenen Dokument"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,help:mail.field_mail_template_report_name
+#: model:ir.model.fields,help:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,help:mail.field_mail_template__report_name
 msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
@@ -3422,71 +3166,71 @@ msgstr ""
 "Die Endung kann weggelassen werden und wird dann automatisch bestimmt."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_mail_needaction
-#: model:ir.model.fields,help:mail.field_mail_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_mail__needaction
+#: model:ir.model.fields,help:mail.field_mail_message__needaction
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__needaction
 #: model:ir.ui.view,arch_db:mail.view_message_search
 msgid "Need Action"
 msgstr "Erfordert Aktion"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_res_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
 msgid "Needaction Recipient"
 msgstr "Bedarfsaktionsempfänger"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:138
+#: code:addons/mail/static/src/xml/discuss.xml:138
 #, python-format
 msgid "New Channel"
 msgstr "Neuer Kanal"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:137
+#: code:addons/mail/static/src/xml/discuss.xml:137
 #, python-format
 msgid "New Message"
 msgstr "Neue Nachricht "
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_char
 msgid "New Value Char"
 msgstr "Neuer Zeichenwert"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_datetime
 msgid "New Value Datetime"
 msgstr "Neuer Datetime Wert"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_float
 msgid "New Value Float"
 msgstr "Neuer Float Wert"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_integer
 msgid "New Value Integer"
 msgstr "Neuer Integer Wert"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_monetary
 msgid "New Value Monetary"
 msgstr "Neuer monetärer Wert"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_text
 msgid "New Value Text"
 msgstr "Neuer textueller Wert"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:55
-#: code:addons/mail/static/src/js/window_manager.js:139
+#: code:addons/mail/static/src/js/services/chat_manager.js:1625
+#: code:addons/mail/static/src/js/services/chat_window_manager.js:283
 #: code:addons/mail/static/src/xml/systray.xml:12
 #: code:addons/mail/static/src/xml/systray.xml:21
 #, python-format
@@ -3495,21 +3239,21 @@ msgstr "Neue Nachricht"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:233
+#: code:addons/mail/static/src/xml/thread.xml:238
 #, python-format
 msgid "New messages"
 msgstr "Neue Nachricht"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:110
+#: code:addons/mail/static/src/xml/thread.xml:115
 #, python-format
 msgid "New messages appear here."
 msgstr "Neue Nachrichten finden Sie hier."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:97
+#: code:addons/mail/static/src/js/discuss.js:99
 #, python-format
 msgid "New people"
 msgstr "Neue Personen"
@@ -3520,85 +3264,85 @@ msgid "Next Activities"
 msgstr "Nächste Aktivitäten"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_date_deadline
 msgid "Next Activity Deadline"
 msgstr "Nächste Aktivitätsfrist"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_summary
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_summary
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_summary
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_summary
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_summary
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_summary
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_summary
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_summary
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_summary
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_summary
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_summary
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_summary
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_summary
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_summary
 msgid "Next Activity Summary"
 msgstr "Zusammenfassung nächste Aktion"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_type_id
 msgid "Next Activity Type"
 msgstr "Nächster Aktivitätstyp"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,field_description:mail.field_mail_activity__has_recommended_activities
 msgid "Next activities available"
 msgstr "Nächste verfügbare Aktivitäten"
 
@@ -3642,28 +3386,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:113
+#: code:addons/mail/static/src/xml/thread.xml:118
 #, python-format
 msgid "No starred message"
 msgstr "Keine priorisierte Mitteilung"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__no_auto_thread
 msgid "No threading for answers"
 msgstr "Antworten werden nicht eingerückt"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_note
+#: model:ir.model.fields,field_description:mail.field_mail_activity__note
 #: model:mail.message.subtype,name:mail.mt_note
 msgid "Note"
 msgstr "Notiz"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:157
+#: code:addons/mail/static/src/xml/thread.xml:162
 #, python-format
 msgid "Note by"
 msgstr "Notiz von"
@@ -3674,101 +3418,102 @@ msgid "Notification"
 msgstr "Benachrichtigung"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_users_notification_type
+#: model:ir.model.fields,field_description:mail.field_res_users__notification_type
 msgid "Notification Management"
 msgstr "Benachrichtigungsverwaltung"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_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 "Benachrichtigungen"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers"
 msgstr "Abonnenten benachrichtigen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_notify
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_notify
+#: model:ir.model.fields,help:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers of the document (mass post only)"
 msgstr ""
 "Benachrichtigen Sie die Abonnenten dieses Dokuments (nur bei Massenmail)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of Actions"
 msgstr "Anzahl der Aktionen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_days
+#: 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."
@@ -3777,149 +3522,153 @@ msgstr ""
 "Aktionsfrist planen."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_payment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of messages which requires an action"
 msgstr "Anzahl der Nachrichten, die eine Aktion erfordern"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread_counter
 msgid "Number of unread messages"
 msgstr "Anzahl ungelesener Nachrichten"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model:ir.ui.view,arch_db:mail.message_notification_email
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Odoo"
 msgstr "Odoo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:895
+#: code:addons/mail/static/src/js/discuss.js:910
 #, python-format
 msgid ""
 "Odoo has now the permission to send you native notifications on this device."
@@ -3929,14 +3678,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "Odoo needs your permission to"
 msgstr "Odoo benötigt Erlaubnis für"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:892
+#: code:addons/mail/static/src/js/discuss.js:907
 #, python-format
 msgid ""
 "Odoo will not have the permission to send native notifications on this "
@@ -3947,38 +3696,38 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:120
+#: code:addons/mail/static/src/xml/discuss.xml:120
 #, python-format
 msgid "Offline"
 msgstr "Offline"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_char
 msgid "Old Value Char"
 msgstr "Alter Zeichenwert"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_datetime
 msgid "Old Value DateTime"
 msgstr "Alter DateTime Wert"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_float
 msgid "Old Value Float"
 msgstr "Alter Float Wert"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_integer
 msgid "Old Value Integer"
 msgstr "Alter Integer Wert"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_monetary
 msgid "Old Value Monetary"
 msgstr "Alter monetärer Wert"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_text
 msgid "Old Value Text"
 msgstr "Alter textueller Wert"
 
@@ -4007,14 +3756,14 @@ msgstr "Ein Abonnent"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:118
-#: code:addons/mail/static/src/xml/client_action.xml:202
+#: code:addons/mail/static/src/xml/discuss.xml:118
+#: code:addons/mail/static/src/xml/discuss.xml:202
 #, python-format
 msgid "Online"
 msgstr "Online"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:22
+#: code:addons/mail/models/ir_model.py:28
 #, python-format
 msgid "Only custom models can be modified."
 msgstr "Nur das Kunden-Model kann modifiziert werden."
@@ -4036,14 +3785,14 @@ msgstr "Verknüpftes Dokument öffnen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Open channel settings"
 msgstr "Öffne Livechat Einstellungen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:187
+#: code:addons/mail/static/src/xml/discuss.xml:187
 #, python-format
 msgid "Open chat"
 msgstr "Chat öffnen"
@@ -4056,15 +3805,15 @@ msgid "Open in Discuss"
 msgstr "In Diskusion öffnen"
 
 #. 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
+#: 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"
 msgstr "Keine Werbe-E-Mails"
 
 #. module: mail
-#: 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_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
 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 "
@@ -4075,8 +3824,8 @@ msgstr ""
 "dies die Anlage neuer Datensätze vollständig."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,help:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,help:mail.field_mail_template__mail_server_id
 msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
@@ -4085,14 +3834,14 @@ msgstr ""
 " der Server mit der höchten Priorität verwendet."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_template
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_template
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_template
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_template
 msgid "Optional report to print and attach"
 msgstr "Optionaler zu druckender und anzuhängender Report"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_lang
-#: model:ir.model.fields,help:mail.field_mail_template_lang
+#: model:ir.model.fields,help:mail.field_email_template_preview__lang
+#: model:ir.model.fields,help:mail.field_mail_template__lang
 msgid ""
 "Optional translation language (ISO code) to select when sending out an "
 "email. If not set, the english version will be used. This should usually be "
@@ -4105,8 +3854,8 @@ msgstr ""
 "Sprache enthält, z.B. ${object.partner_id.lang}."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,help:mail.field_mail_template_null_value
+#: model:ir.model.fields,help:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,help:mail.field_mail_template__null_value
 msgid "Optional value to use if the target field is empty"
 msgstr "Optionaler Wert, wenn das Zielfeld leer ist."
 
@@ -4121,8 +3870,8 @@ msgid "Outgoing"
 msgstr "Ausgehend"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__mail_server_id
 msgid "Outgoing Mail Server"
 msgstr "Postausgangsserver"
 
@@ -4132,10 +3881,10 @@ msgid "Outgoing Mails"
 msgstr "Postausgang"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_server_id
 msgid "Outgoing mail server"
 msgstr "Ausgehender Mailserver"
 
@@ -4149,12 +3898,12 @@ msgstr "Ausgehender Mailserver"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4168,43 +3917,43 @@ msgid "Override author's email"
 msgstr "Überschreibe die E-Mail des Verfassers"
 
 #. module: mail
-#: 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_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
 msgid "Owner"
 msgstr "Besitzer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__parent_id
 msgid "Parent"
 msgstr "Übergeordnet"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__parent_id
 msgid "Parent Message"
 msgstr "Übergeordnete Nachricht"
 
 #. module: mail
-#: 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_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
 msgid "Parent Model"
 msgstr "Hauptvorlage"
 
 #. module: mail
-#: 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_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
 msgid "Parent Record Thread ID"
 msgstr "Zugehörige Diskussion"
 
 #. module: mail
-#: 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_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
 msgid ""
 "Parent model holding the alias. The model holding the alias reference is not"
 " necessarily the model given by alias_model_id (example: project "
@@ -4215,7 +3964,7 @@ msgstr ""
 "alias_model_id (Beispiel: project (parent_model) und task (model))"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__parent_id
 msgid ""
 "Parent subtype, used for automatic subscription. This field is not correctly"
 " named. For example on a project, the parent_id of project subtypes refers "
@@ -4243,43 +3992,43 @@ msgstr ""
 "Partner, die die Aufnahme in die Massen-E-Mail-Kampagnen nicht erbeten haben"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction_partner_ids
 msgid "Partners with Need Action"
 msgstr "Partner mit Handlungsbedarf"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_template__auto_delete
 msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 "Dauerhafte Löschung dieser E-Mail nach dem Versand, um Platz zu sparen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:891
+#: code:addons/mail/static/src/js/discuss.js:906
 #, python-format
 msgid "Permission denied"
 msgstr "Berechtigung verweigert"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:894
+#: code:addons/mail/static/src/js/discuss.js:909
 #, python-format
 msgid "Permission granted"
 msgstr "Berechtigung gewährt"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image
 msgid "Photo"
 msgstr "Bild"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,field_description:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,field_description:mail.field_mail_template__copyvalue
 msgid "Placeholder Expression"
 msgstr "Platzhalterausdruck"
 
@@ -4293,12 +4042,12 @@ msgstr "Platzhalterausdruck"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4314,50 +4063,57 @@ msgid "Planned activities"
 msgstr "geplante Aktivitäten"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__days
+msgid "Planned in"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:282
+#: code:addons/mail/static/src/xml/thread.xml:287
 #, python-format
 msgid "Play this video"
 msgstr "Vidio abspielen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:158
+#: code:addons/mail/static/src/js/chatter_composer.js:157
 #, python-format
 msgid "Please complete customer's informations"
 msgstr "Bitte vervollständigen Sie die Kundeninformationen."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:84
+#: code:addons/mail/static/src/js/many2many_tags_email.js:96
 #, python-format
 msgid "Please complete customer's informations and email"
 msgstr ""
 "Bitte vervollständigen Sie die Kundeninformationen und E-Mail-Adresse."
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Please contact us instead using"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Please, wait while the file is uploading."
 msgstr "Bitte warten, während die Datei hochgeladen wird."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_notification_type
+#: model:ir.model.fields,help:mail.field_res_users__notification_type
 msgid ""
 "Policy on how to handle Chatter notifications:\n"
-"- Emails: notifications are sent to your email\n"
-"- Odoo: notifications appear in your Odoo Inbox"
+"- Handle by Emails: notifications are sent to your email address\n"
+"- Handle in Odoo: notifications appear in your Odoo Inbox"
 msgstr ""
-"Richtlinie zum Umgang mit Chatter-Benachrichtigungen: \n"
-"– E-Mails: Benachrichtigungen werden an Ihre E-Mail gesendet \n"
-"– Odoo: Benachrichtigungen erscheinen in Ihrem Odoo-Posteingang"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_alias_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_channel_alias_contact
-#: model:ir.model.fields,help:mail.field_res_users_alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_channel__alias_contact
+#: model:ir.model.fields,help:mail.field_res_users__alias_contact
 msgid ""
 "Policy to post a message on the document using the mailgateway.\n"
 "- everyone: everyone can post\n"
@@ -4370,12 +4126,13 @@ msgstr ""
 "- Follower: nur die Personen, die dem betreffenden Dokument folgen oder Mitglieder von Kanälen sind, die dem Dokument folgen\n"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Powered by"
 msgstr "Ein System von"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_previous_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__previous_type_ids
 msgid "Preceding Activities"
 msgstr "Vorangehende Aktivitäten"
 
@@ -4385,8 +4142,8 @@ msgid "Preferred reply address"
 msgstr "Bevorzugte Antwortadresse"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,help:mail.field_mail_template_reply_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,help:mail.field_mail_template__reply_to
 msgid "Preferred response address (placeholders may be used here)"
 msgstr "Bevorzugte Antwort-Adresse (Platzhalter können verwendet werden)"
 
@@ -4401,27 +4158,27 @@ msgid "Preview of"
 msgstr "Vorschau von"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_previous_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__previous_activity_type_id
 msgid "Previous Activity Type"
 msgstr "Vorhergehender Aktivitätstyp"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_public
+#: model:ir.model.fields,field_description:mail.field_mail_channel__public
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Privacy"
 msgstr "Privatsphäre"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:56
-#: code:addons/mail/static/src/xml/client_action.xml:176
+#: code:addons/mail/static/src/xml/discuss.xml:56
+#: code:addons/mail/static/src/xml/discuss.xml:176
 #, python-format
 msgid "Private Channels"
 msgstr "Private Kanäle"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:848
+#: code:addons/mail/static/src/js/discuss.js:863
 #, python-format
 msgid "Public Channels"
 msgstr "Öffentliche Kanäle"
@@ -4450,68 +4207,72 @@ msgid "Received"
 msgstr "Empfangen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_id
 msgid "Recipient"
 msgstr "Empfänger"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Recipients"
 msgstr "Empfänger"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_recommended_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__recommended_activity_type_id
 msgid "Recommended Activity Type"
 msgstr "Empfohlener Aktivitätstyp"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_next_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__next_type_ids
 msgid "Recommended Next Activities"
 msgstr "Empfohlene nächste Aktivitäten"
 
 #. module: mail
-#: 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_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
 msgid "Record Thread ID"
 msgstr "Aufzeichnung Diskussion ID"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_references
+#: model:ir.model.fields,field_description:mail.field_mail_mail__references
 msgid "References"
 msgstr "Referenzen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_res_id
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Regards,"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__res_id
 msgid "Related Document ID"
 msgstr "Zugehörige Dokumenten-ID"
 
 #. 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_mail_model
-#: model:ir.model.fields,field_description:mail.field_mail_message_model
-#: model:ir.model.fields,field_description:mail.field_mail_template_model
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_model
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_model
+#: 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_compose_message__model
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_model
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__model
 msgid "Related Document Model"
 msgstr "Zugehöriges Dokumenten-Modell"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_model
 msgid "Related Document Model Name"
 msgstr "Modellname des zugehörigen Dokuments"
 
@@ -4521,12 +4282,12 @@ msgid "Related Message"
 msgstr "Verknüpfte Nachricht"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__partner_id
 msgid "Related Partner"
 msgstr "Zugehöriger Partner"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__relation_field
 msgid "Relation field"
 msgstr "Verknüpftes Feld"
 
@@ -4546,17 +4307,17 @@ msgstr "Abonnent löschen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:203
+#: code:addons/mail/static/src/xml/thread.xml:208
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Reply"
 msgstr "Antworten"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,help:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,help:mail.field_mail_message_reply_to
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,help:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,help:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,help:mail.field_mail_message__reply_to
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__reply_to
 msgid ""
 "Reply email address. Setting the reply_to bypasses the automatic thread "
 "creation."
@@ -4565,46 +4326,46 @@ msgstr ""
 "Diskussionsrunde verhindert."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_reply_to
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__reply_to
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__reply_to
 msgid "Reply-To"
 msgstr "Antwort an"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_name
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_name
 msgid "Report Filename"
 msgstr "Report Dateiname"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_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 "Verantwortlich"
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_user_id
+msgid "Responsible User"
+msgstr "Manager Veranstaltung"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
@@ -4613,12 +4374,12 @@ msgid "Retry"
 msgstr "Wiederholen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body_html
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body_html
 msgid "Rich-text Contents"
 msgstr "Rich-Text Inhalte"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_body_html
+#: model:ir.model.fields,help:mail.field_mail_mail__body_html
 msgid "Rich-text/HTML message"
 msgstr "Rich-text/HTML-Nachricht"
 
@@ -4628,7 +4389,7 @@ msgid "SMTP Server"
 msgstr "Postausgang-Server (SMTP)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_res_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__res_id
 msgid "Sample Document"
 msgstr "Beispieldokument"
 
@@ -4662,26 +4423,26 @@ msgid "Schedule activity"
 msgstr "Aktivität planen"
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:250
+#: code:addons/mail/models/mail_activity.py:260
 #, python-format
 msgid "Schedule an Activity"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:57
 #, python-format
 msgid "Schedule an activity"
 msgstr "Eine Aktivität planen"
 
 #. 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
+#: 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"
 msgstr "Geplantes Datum"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__scheduled_date
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Scheduled Send Date"
 msgstr "Geplantes Sendedatum"
@@ -4697,8 +4458,8 @@ msgid "Search Groups"
 msgstr "Gruppen suchen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__model_object_field
 msgid ""
 "Select target field from the related document model.\n"
 "If it is a relationship field you will be able to select a target field at the destination of the relationship."
@@ -4713,19 +4474,19 @@ msgstr "Ausgewählte Gruppe von Nutzern"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:374
+#: code:addons/mail/static/src/js/composer.js:428
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Send"
 msgstr "Senden"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail
 msgid "Send Email"
 msgstr "E-Mail versenden"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:264
+#: code:addons/mail/models/mail_template.py:295
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Mail (%s) versenden"
@@ -4751,13 +4512,13 @@ msgid "Send message"
 msgstr "Sende Nachricht"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
+#: model:ir.model.fields,field_description:mail.field_mail_channel__email_send
 msgid "Send messages by email"
 msgstr "Nachrichten per E-Mail versenden"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_from
-#: model:ir.model.fields,help:mail.field_mail_template_email_from
+#: model:ir.model.fields,help:mail.field_email_template_preview__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 "
 "value will be the author's email alias if configured, or email address."
@@ -4768,14 +4529,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Sending Error"
 msgstr "Sende fehler"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:108
+#: code:addons/mail/static/src/xml/discuss.xml:108
 #, python-format
 msgid "Sends messages by email"
 msgstr "Versendet Nachrichten per E-Mail"
@@ -4787,25 +4548,30 @@ msgid "Sent"
 msgstr "Gesendet"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_email
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "Sent by"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_email
 msgid "Sent by Email"
 msgstr "Per E-Mail versenden"
 
 #. 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
+#: 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 "Reihenfolge"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Settings"
 msgstr "Einstellungen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__shortcode_type
 msgid "Shortcode Type"
 msgstr "Typ des Kurzbefehls"
 
@@ -4816,7 +4582,7 @@ msgid "Shortcodes"
 msgstr "Kurzbefehle"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__source
 msgid "Shortcut"
 msgstr "Tastenkombination (Shortcut)"
 
@@ -4827,20 +4593,20 @@ msgid "Show all records which has next action date is before today"
 msgstr "Alle Datensätze mit vor heute geplanten Aktionen anzeigen"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:667
+#: code:addons/mail/models/mail_channel.py:673
 #, python-format
 msgid "Show an helper message"
 msgstr "mehr Nachrichten anzeigen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,field_description:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_mail_template__ref_ir_act_window
 msgid "Sidebar action"
 msgstr "Sidebar-Aktion"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,help:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_mail_template__ref_ir_act_window
 msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
@@ -4849,10 +4615,10 @@ msgstr ""
 "Datenmodells verfügbar zu machen."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_avatar
 msgid ""
 "Small-sized image of this contact. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4863,12 +4629,12 @@ msgstr ""
 "überall, wo ein Miniaturbild benötigt wird."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_small
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_small
 msgid "Small-sized photo"
 msgstr "Miniaturansicht"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_small
+#: model:ir.model.fields,help:mail.field_mail_channel__image_small
 msgid ""
 "Small-sized photo of the group. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4884,7 +4650,7 @@ msgid "Smiley"
 msgstr "Smiley"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_res_model_id
+#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_id
 msgid ""
 "Specify a model if the activity should be specific to a model and not "
 "available when managing activities for other models."
@@ -4895,74 +4661,52 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:661
-#: code:addons/mail/static/src/xml/client_action.xml:28
-#: code:addons/mail/static/src/xml/client_action.xml:156
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred
+#: code:addons/mail/static/src/js/services/chat_manager.js:89
+#: code:addons/mail/static/src/xml/discuss.xml:28
+#: code:addons/mail/static/src/xml/discuss.xml:156
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred
 #, python-format
 msgid "Starred"
 msgstr "Markiert"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_state
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_state
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_mail_activity__state
 msgid "State"
 msgstr "Bundesland"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_state
+#: 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
 msgid "Status"
 msgstr "Status"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,help:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,help:mail.field_event_track_activity_state
-#: model:ir.model.fields,help:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,help:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,help:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,help:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,help:mail.field_product_template_activity_state
-#: model:ir.model.fields,help:mail.field_project_task_activity_state
-#: model:ir.model.fields,help:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,help:mail.field_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
+#: model:ir.model.fields,help:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,help:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,help:mail.field_event_track__activity_state
+#: model:ir.model.fields,help:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,help:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,help:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,help:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,help:mail.field_note_note__activity_state
+#: model:ir.model.fields,help:mail.field_product_product__activity_state
+#: model:ir.model.fields,help:mail.field_product_template__activity_state
+#: model:ir.model.fields,help:mail.field_project_task__activity_state
+#: model:ir.model.fields,help:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,help:mail.field_repair_order__activity_state
+#: model:ir.model.fields,help:mail.field_res_partner__activity_state
+#: model:ir.model.fields,help:mail.field_res_users__activity_state
+#: model:ir.model.fields,help:mail.field_sale_order__activity_state
+#: model:ir.model.fields,help:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,help:mail.field_survey_survey__activity_state
 msgid ""
 "Status based on activities\n"
 "Overdue: Due date is already passed\n"
@@ -4975,33 +4719,33 @@ msgstr ""
 "Geplant: anstehende Aktivitäten."
 
 #. 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
+#: 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"
 msgstr "Untergeordnetes Feld"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,field_description:mail.field_mail_template_sub_object
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,field_description:mail.field_mail_template__sub_object
 msgid "Sub-model"
 msgstr "Sub-Modell"
 
 #. module: mail
 #. 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_mail_compose_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_mail_subject
-#: model:ir.model.fields,field_description:mail.field_mail_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_template_subject
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subject
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__subject
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_mail__subject
+#: model:ir.model.fields,field_description:mail.field_mail_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_template__subject
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subject
 #, python-format
 msgid "Subject"
 msgstr "Betreff"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_subject
-#: model:ir.model.fields,help:mail.field_mail_template_subject
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr "Betreff (Platzhalter können verwendet werden)"
@@ -5013,22 +4757,22 @@ msgstr "Betreff..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:216
+#: code:addons/mail/static/src/xml/thread.xml:221
 #, python-format
 msgid "Subject:"
 msgstr "Betreff:"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_substitution
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__substitution
 msgid "Substitution"
 msgstr "Ersetzung"
 
 #. module: mail
-#: 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_1993
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subtype_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subtype_id
 #: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
 msgid "Subtype"
 msgstr "Subtyp"
@@ -5040,8 +4784,8 @@ msgid "Subtypes"
 msgstr "Subtypen"
 
 #. 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
+#: 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 "Zusammenfassung"
 
@@ -5053,7 +4797,7 @@ msgid "System notification"
 msgstr "Systembenachrichtigung"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,help:mail.field_mail_activity__has_recommended_activities
 msgid "Technical field for UX purpose"
 msgstr "Datenfeld für die Benutzerfreundlichkeit"
 
@@ -5063,6 +4807,14 @@ msgid "Template Preview"
 msgstr "Vorlagenvorschau"
 
 #. module: mail
+#: code:addons/mail/models/mail_template.py:264
+#, python-format
+msgid ""
+"Template rendering failed, this could mean that your template contains "
+"python syntax errors"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_template_tree_all
 #: model:ir.ui.menu,name:mail.menu_email_templates
 #: model:ir.ui.view,arch_db:mail.email_template_form
@@ -5072,14 +4824,24 @@ msgid "Templates"
 msgstr "Vorlagen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The"
+msgstr "Der"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The email sent to"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_shortcode__substitution
 msgid "The escaped html code replacing the shortcut"
 msgstr "Der auskommentierte HTLM-Code, der das Tastaturkürzel ersetzt"
 
 #. module: mail
-#: 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_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
 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 "
@@ -5090,9 +4852,9 @@ msgstr ""
 "üblicherweise zur Erstellung eines neuen Datensatz (z.B. Projektaufgabe)."
 
 #. module: mail
-#: 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_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
 msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
@@ -5101,9 +4863,9 @@ msgstr ""
 "<jobs@example.odoo.com> erhalten möchten"
 
 #. module: mail
-#: 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_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
 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 "
@@ -5117,9 +4879,9 @@ msgstr ""
 "Adresse gefunden wird."
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:165
-#: code:addons/mail/models/mail_message.py:579
-#: code:addons/mail/models/mail_message.py:674
+#: code:addons/mail/models/mail_activity.py:175
+#: code:addons/mail/models/mail_message.py:578
+#: code:addons/mail/models/mail_message.py:678
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -5131,19 +4893,19 @@ msgstr ""
 "(Dokumenten Typ: %s, Vorgang: %s)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__source
 msgid "The shortcut which must be replaced in the Chat Messages"
 msgstr "Das Tastaturkürzel, das in den Chat-Mitteilungen ersetzt werden muss"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__unicode_source
 msgid "The source is replaced by this unicode character in the Chat Messages"
 msgstr ""
 "Die Quelle wird in Chat-Mitteilungen durch dieses Unicode-Zeichen ersetzt."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,help:mail.field_mail_template_model_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,help:mail.field_mail_template__model_id
 msgid "The type of document this template can be used with"
 msgstr "Dokumenttyp, mit dem diese Vorlage genutzt werden kann"
 
@@ -5153,14 +4915,14 @@ msgid "This"
 msgstr "Diese/r/s"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image
+#: model:ir.model.fields,help:mail.field_mail_channel__image
 msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
 msgstr "Diese Feld enthält das Bild der Gruppe, beschränkt auf 1024x1024px."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_public
+#: model:ir.model.fields,help:mail.field_mail_channel__public
 msgid ""
 "This group is visible by non members. Invisible groups can add members "
 "through the invite button."
@@ -5174,20 +4936,20 @@ msgid "Thread"
 msgstr "Beitrag"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_to
 msgid "To"
 msgstr "Bis"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_to
 msgid "To (Emails)"
 msgstr "An (E-Mails)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_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
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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)"
 msgstr "An (Partner)"
 
@@ -5202,8 +4964,8 @@ msgstr "An"
 #. module: mail
 #. openerp-web
 #: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:25
-#: code:addons/mail/static/src/js/thread.js:242
+#: code:addons/mail/static/src/js/activity.js:82
+#: code:addons/mail/static/src/js/thread.js:328
 #: code:addons/mail/static/src/xml/systray.xml:75
 #: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
 #: selection:hr.applicant,activity_state:0
@@ -5213,12 +4975,12 @@ msgstr "An"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -5240,7 +5002,7 @@ msgstr "Zu erledigen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:35
+#: code:addons/mail/static/src/js/activity.js:92
 #, python-format
 msgid "Tomorrow"
 msgstr "Morgen"
@@ -5251,10 +5013,10 @@ msgid "Topics discussed in this group..."
 msgstr "Diskussionsbeiträge dieser Gruppe"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid ""
 "Tracked values are stored in a separate model. This field allow to "
 "reconstruct the tracking and to generate statistics on the model."
@@ -5264,7 +5026,7 @@ msgstr ""
 "Modell generiert werden."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,field_description:mail.field_ir_model_fields__track_visibility
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Tracking"
 msgstr "Nachverfolgung"
@@ -5282,28 +5044,28 @@ msgid "Tracking Values"
 msgstr "Nachverfolgungswerte"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid "Tracking values"
 msgstr "Nachverfolgungswerte"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_type
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_type
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_type
 msgid "Type"
 msgstr "Typ"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_uuid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__uuid
 msgid "UUID"
 msgstr "UUID"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:235
+#: code:addons/mail/models/mail_mail.py:233
 #, python-format
 msgid "Unable to connect to SMTP Server"
 msgstr "Verbindung mit SMTP-Server nicht möglich"
@@ -5318,7 +5080,6 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:700
 #: code:addons/mail/static/src/xml/followers.xml:22
 #, python-format
 msgid "Unfollow"
@@ -5333,143 +5094,145 @@ msgstr ""
 "eindeutige Bezeichnung"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__unicode_source
 msgid "Unicode Character"
 msgstr "Unicode-Zeichen "
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread_counter
 msgid "Unread Messages Counter"
 msgstr "Zähler der ungelesenen Nachrichten"
 
@@ -5480,61 +5243,61 @@ msgstr "Ungelesene Nachrichten"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all"
 msgstr "Alle entfernen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all messages"
 msgstr "Alle Nachrichten aus Favoriten entfernen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe"
 msgstr "Abmelden"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe from channel"
 msgstr "Aus Channel austragen"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:510
+#: code:addons/mail/models/mail_template.py:504
 #, python-format
 msgid "Unsupported report type %s found."
 msgstr "Nicht unterstützter Berichtstyp %s gefunden."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:322
+#: code:addons/mail/static/src/xml/thread.xml:327
 #, python-format
 msgid "Uploading"
 msgstr "Lade hoch"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Uploading error"
 msgstr "Uploadfehler"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_use_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_use_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__use_active_domain
 msgid "Use active domain"
 msgstr "Benutze die aktive Domain"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_template_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_template_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__template_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__template_id
 msgid "Use template"
 msgstr "Benutze Vorlage"
 
@@ -5544,7 +5307,7 @@ msgid "Use your own email servers"
 msgstr "Benutze deinen eigenen Email-Server"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_sequence
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__sequence
 msgid "Used to order subtypes."
 msgstr "Wird zur Sortierung der Subtypen genutzt"
 
@@ -5557,7 +5320,7 @@ msgstr "Benutzer"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:51
+#: code:addons/mail/static/src/xml/discuss.xml:51
 #: code:addons/mail/static/src/xml/extended_chat_window.xml:8
 #, python-format
 msgid "User name"
@@ -5569,7 +5332,7 @@ msgid "Users"
 msgstr "Benutzer"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:711
+#: code:addons/mail/models/mail_channel.py:717
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Benutzer in diesem Kanal: %s %s und du "
@@ -5587,14 +5350,14 @@ msgstr ""
 "(@mycompany.odoo.com) profitieren."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:670
+#: code:addons/mail/models/mail_thread.py:696
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 #, python-format
 msgid "View"
 msgstr "Ansicht"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:668
+#: code:addons/mail/models/mail_thread.py:694
 #, python-format
 msgid "View %s"
 msgstr "%s ansehen"
@@ -5613,8 +5376,8 @@ msgstr ""
 "Möchten Sie diesen Follower wirklich entfernen?"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_sub_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__sub_model_object_field
 msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
@@ -5623,8 +5386,8 @@ msgstr ""
 "Zielfeld der Relation auswählen (sub-model)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,help:mail.field_mail_template_sub_object
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,help:mail.field_mail_template__sub_object
 msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
@@ -5633,7 +5396,7 @@ msgstr ""
 "Relation angezeigt."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,help:mail.field_ir_model_fields__track_visibility
 msgid ""
 "When set, every modification to this field will be tracked in the chatter."
 msgstr ""
@@ -5641,13 +5404,13 @@ msgstr ""
 " Chatter nachverfolgt."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_is_log
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_is_log
+#: model:ir.model.fields,help:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__is_log
 msgid "Whether the message is an internal note (comment mode only)"
 msgstr "Wenn die Nachricht eine interne Notiz ist (Kommentar Modus)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,help:mail.field_ir_model__is_mail_thread
 msgid "Whether this model supports messages and notifications."
 msgstr ""
 "Gibt an, ob dieses Modell Mitteilungen und Benachrichtigungen unterstützt."
@@ -5666,47 +5429,47 @@ msgstr "Schreibe ein Feedback"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:12
+#: code:addons/mail/static/src/xml/composer.xml:11
 #, python-format
-msgid "Write something..."
-msgstr "Schreiben Sie etwas..."
+msgid "Write Something..."
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:29
-#: code:addons/mail/static/src/js/thread.js:244
+#: code:addons/mail/static/src/js/activity.js:86
+#: code:addons/mail/static/src/js/thread.js:330
 #, python-format
 msgid "Yesterday"
 msgstr "Gestern"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:96
+#: code:addons/mail/static/src/js/discuss.js:98
 #, python-format
 msgid "You added <b>%s</b> to the conversation."
 msgstr "Sie haben <b>%s</b> zur Konversation hinzugefügt."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:708
+#: code:addons/mail/models/mail_channel.py:714
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Sie sind allein in diesem Kanal."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:677
+#: code:addons/mail/models/mail_channel.py:683
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "Sie befinden sich in einem privaten Gespräch mit <b>@%s</b>."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:672
+#: code:addons/mail/models/mail_channel.py:678
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Sie befinden sich im Kanal <b>#%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:114
+#: code:addons/mail/static/src/xml/thread.xml:119
 #, python-format
 msgid ""
 "You can mark any message as 'starred', and it shows up in this channel."
@@ -5714,7 +5477,7 @@ msgstr ""
 "Sie können beliebige Mitteilungen zur Anzeige in diesem Kanal priorisieren."
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:54
+#: code:addons/mail/models/res_users.py:53
 #, python-format
 msgid ""
 "You cannot create a new user from here.\n"
@@ -5734,14 +5497,11 @@ msgstr ""
 "Gesamtunternehmen in anderen Modulen benötigt wird."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:349
+#: code:addons/mail/models/mail_thread.py:342
 #, python-format
 msgid ""
-"You could also add a new %(document)s by sending an email to: "
-"%(email_link)s."
+"You could also add a new %(document)s by sending an email to %(email_link)s"
 msgstr ""
-"Sie können ein neues %(document)s auch erzeugen, indem Sie ein E-Mail an "
-"%(email_link)s schicken."
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
@@ -5750,14 +5510,14 @@ msgstr "Du wurdest hinzugefügt zu "
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "You have been invited to: "
 msgstr "Sie wurden eingeladen zu:"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,help:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_template__attachment_ids
 msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
@@ -5767,28 +5527,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:473
+#: code:addons/mail/static/src/js/services/chat_manager.js:1536
 #, python-format
 msgid "You unpinned your conversation with <b>%s</b>."
 msgstr "Ihr Gespräch mit <b>%s</b> ist nicht länger angeheftet."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:471
+#: code:addons/mail/static/src/js/services/chat_manager.js:1534
 #, python-format
 msgid "You unsubscribed from <b>%s</b>."
 msgstr "Sie wurden von <b>%s</b> abgemeldet."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:217
+#: code:addons/mail/static/src/xml/discuss.xml:217
 #, python-format
 msgid "You:"
 msgstr "Du : "
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Your message has not been sent."
 msgstr "Deine Nachricht wurde nicht gesendet."
@@ -5800,23 +5560,35 @@ msgid "Your template should define email_from"
 msgstr "Ihre Vorlage sollte email_from beinhalten"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "alias %s: %s"
 msgstr "alias %s: %s"
 
 #. module: mail
+#: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
+msgid "base.partner.merge.automatic.wizard"
+msgstr "base.partner.merge.automatic.wizard"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "by"
 msgstr "durch"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid ""
+"cannot be processed. This address\n"
+"    is used to collect replies and should not be used to directly contact"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "angelegt"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:315
+#: code:addons/mail/models/mail_thread.py:309
 #, python-format
 msgid "document"
 msgstr "Dokument"
@@ -5837,7 +5609,7 @@ msgstr "z.B. Angebotsbesprechung"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "enable desktop notifications"
 msgstr "Bildschirmbenachrichtigungen aktivieren"
@@ -5872,13 +5644,13 @@ msgid "has been"
 msgstr "wurde"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:282
+#: code:addons/mail/models/mail_alias.py:271
 #, python-format
 msgid "incorrectly configured alias"
 msgstr "Nicht richtig konfigurierter alias "
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:278
+#: code:addons/mail/models/mail_alias.py:267
 #, python-format
 msgid "incorrectly configured alias (unknown reference record)"
 msgstr "Nicht richtig konfigurierter Alias (unbekannter Referenzdatensatz)"
@@ -5899,19 +5671,19 @@ msgid "mail.alias.mixin"
 msgstr "mail.alias.mixin"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:943
+#: code:addons/mail/models/mail_thread.py:925
 #, python-format
 msgid "model %s does not accept document creation"
 msgstr "Modell %s erlaubt keine Dokumenterstellung"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:938
+#: code:addons/mail/models/mail_thread.py:920
 #, python-format
 msgid "model %s does not accept document update"
 msgstr "Modell %s erlaubt keine Dokumentaktualisierung"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:931
+#: code:addons/mail/models/mail_thread.py:913
 #, python-format
 msgid ""
 "model %s does not accept document update, fall back on document creation"
@@ -5938,14 +5710,14 @@ msgstr "Jetzt"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:177
+#: code:addons/mail/static/src/xml/thread.xml:181
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "on"
 msgstr "an"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid ""
 "posting a message without model should be with a null res_id (private "
@@ -5955,7 +5727,7 @@ msgstr ""
 " (private Mitteilung) erfolgen, %s empfangen."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:917
+#: code:addons/mail/models/mail_thread.py:899
 #, python-format
 msgid ""
 "posting a message without model should be with a parent_id (private message)"
@@ -5988,13 +5760,13 @@ msgid "record:"
 msgstr "Datensatz:"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:935
+#: code:addons/mail/models/mail_thread.py:917
 #, python-format
 msgid "reply to missing document (%s,%s)"
 msgstr "Antwort auf fehlendes Dokument (%s,%s)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:928
+#: code:addons/mail/models/mail_thread.py:910
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
 msgstr "Antwort auf fehlendes Dokument (%s,%s), alternativ Dokumenterstellung"
@@ -6005,40 +5777,45 @@ msgid "res.config.settings"
 msgstr "res.config.settings"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid "resetting thread_id"
 msgstr "resetting thread_id"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:254
+#: code:addons/mail/models/mail_channel.py:252
 #, python-format
 msgid "restricted to channel members"
 msgstr "beschränkt auf Kanalmitglieder"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:287
+#: code:addons/mail/models/mail_alias.py:276
 #, python-format
 msgid "restricted to followers"
 msgstr "beschränkt auf Follower"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:291
+#: code:addons/mail/models/mail_alias.py:280
 #, python-format
 msgid "restricted to known authors"
 msgstr "beschränkt auf unbekannte Autoren"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:899
 #: code:addons/mail/models/mail_thread.py:917
-#: code:addons/mail/models/mail_thread.py:935
-#: code:addons/mail/models/mail_thread.py:938
-#: code:addons/mail/models/mail_thread.py:943
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:920
+#: code:addons/mail/models/mail_thread.py:925
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "skipping"
 msgstr "Überspringen"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "team."
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:20
 #, python-format
@@ -6046,13 +5823,18 @@ msgid "this document"
 msgstr "diesem Dokument"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "unknown error"
 msgstr "unbekannter Fehler"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:906
+#: code:addons/mail/models/mail_thread.py:888
 #, python-format
 msgid "unknown target model %s"
 msgstr "unbekanntes Zielmodel %s"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "using"
+msgstr ""
diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po
index 947465fb012..bf6047b4bd1 100644
--- a/addons/mail/i18n/es.po
+++ b/addons/mail/i18n/es.po
@@ -38,13 +38,15 @@
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
 # Eduardo Magdalena <emagdalena@close2circle.com>, 2017
 # e2f <projects@e2f.com>, 2018
+# Paloma Yazmin Reyes Morales <paloma.reyes@jarsa.com.mx>, 2018
+# e2f_EPV Translator <e2f_EPV@outlook.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.1\n"
+"Project-Id-Version: Odoo Server saas~11.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-13 14:36+0000\n"
-"PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: e2f <projects@e2f.com>, 2018\n"
+"POT-Creation-Date: 2018-03-22 14:10+0000\n"
+"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"Last-Translator: e2f_EPV Translator <e2f_EPV@outlook.com>, 2018\n"
 "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"
@@ -53,254 +55,59 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_data_notification_email_default
-msgid ""
-"\n"
-"% set company = ctx.get('company', user.company_id)\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"
-"        <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-"        <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
-"    </div>\n"
-"</div>\n"
-"% endif\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('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('has_button_follow'):\n"
-"        % if ctx.get('has_button_access'):\n"
-"           |\n"
-"        % endif\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=\"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=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
-"        % endfor\n"
-"        % endif\n"
-"    </td>\n"
-"    <td valign=\"center\" align=\"right\">\n"
-"        <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\">\n"
-"    </td>\n"
-"</tr>\n"
-"<tr>\n"
-"    <td colspan=\"2\" style=\"text-align:center;\">\n"
-"        <hr width=\"100%\"\n"
-"            style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
-"        % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
-"        <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n"
-"            <strong>Internal communication</strong>: Replying will post an internal note. Followers won't receive any email notification.\n"
-"        </p>\n"
-"        % endif\n"
-"    </td>\n"
-"</tr>\n"
-"</tbody></table>\n"
-"</div>\n"
-"% endif\n"
-"<div>\n"
-"    ${object.body | safe}\n"
-"</div>\n"
-"% if ctx.get('tracking'):\n"
-"    <ul>\n"
-"    % for tracking in ctx['tracking']\n"
-"        <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
-"    % endfor\n"
-"    </ul>\n"
-"% endif\n"
-"\n"
-"% if ctx.get('signature'):\n"
-"    ${ctx['signature'] | safe}\n"
-"% endif\n"
-"<br/>\n"
-"<p style=\"color: #555555;\">\n"
-"    Sent by\n"
-"    % if ctx.get('website_url'):\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 target=\"_blank\" href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\">Odoo</a>.\n"
-"</p>\n"
-"</div>"
-msgstr ""
-"\n"
-"% set company = ctx.get('company', user.company_id)\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"
-"        <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-"        <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
-"    </div>\n"
-"</div>\n"
-"% endif\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('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('has_button_follow'):\n"
-"        % if ctx.get('has_button_access'):\n"
-"           |\n"
-"        % endif\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=\"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=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
-"        % endfor\n"
-"        % endif\n"
-"    </td>\n"
-"    <td valign=\"center\" align=\"right\">\n"
-"        <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\">\n"
-"    </td>\n"
-"</tr>\n"
-"<tr>\n"
-"    <td colspan=\"2\" style=\"text-align:center;\">\n"
-"        <hr width=\"100%\"\n"
-"            style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
-"        % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
-"        <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n"
-"            <strong>Nota interna</strong>: las respuestas no son enviadas a los seguidores.\n"
-"        </p>\n"
-"        % endif\n"
-"    </td>\n"
-"</tr>\n"
-"</tbody></table>\n"
-"</div>\n"
-"% endif\n"
-"<div>\n"
-"    ${object.body | safe}\n"
-"</div>\n"
-"% if ctx.get('tracking'):\n"
-"    <ul>\n"
-"    % for tracking in ctx['tracking']\n"
-"        <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
-"    % endfor\n"
-"    </ul>\n"
-"% endif\n"
-"\n"
-"% if ctx.get('signature'):\n"
-"    ${ctx['signature'] | safe}\n"
-"% endif\n"
-"<br/>\n"
-"<p style=\"color: #555555;\">\n"
-"    Enviado por\n"
-"    % if ctx.get('website_url'):\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"
-"    usando\n"
-"    <a target=\"_blank\" href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\">Odoo</a>.\n"
-"</p>\n"
-"</div>"
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:674
+#: code:addons/mail/models/mail_channel.py:680
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr "El canal es privado. Hay que tener una invitación para unirse."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_days
-msgid "# Days"
-msgstr "Nº de días"
-
-#. 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) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-msgstr ""
-"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:63
+#: code:addons/mail/static/src/js/services/chat_manager.js:1634
 #, python-format
 msgid "%d Messages"
 msgstr "%d mensajes"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:31
+#: code:addons/mail/static/src/js/activity.js:88
 #, python-format
 msgid "%d days overdue"
 msgstr "%d días de retraso"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:248
+#: code:addons/mail/models/mail_template.py:279
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:236
+#: code:addons/mail/models/mail_thread.py:234
 #, python-format
 msgid "%s created"
 msgstr "%s creado"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:81
+#: code:addons/mail/models/res_users.py:80
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s se ha unido a la red %s."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:211
 #, python-format
 msgid "&nbsp;("
 msgstr "&nbsp;("
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:179
+#: code:addons/mail/static/src/xml/thread.xml:184
 #, python-format
 msgid "(from"
 msgstr "(de"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,help:mail.field_mail_shortcode__shortcode_type
 msgid ""
 "* Smiley are only used for HTML code to display an image * Text (default "
 "value) is used to substitute text with another text"
@@ -317,7 +124,7 @@ msgstr ", vencido a fecha"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:331
+#: code:addons/mail/static/src/xml/thread.xml:336
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr "-------- Mostrar mensajes antiguos--------"
@@ -344,7 +151,7 @@ msgid "0 Today"
 msgstr "0 hoy"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:684
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -360,7 +167,16 @@ msgstr ""
 "            Puedes insertar respuestas enlatadas tecleando <b>:shortcut</b>.<br>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:584
+#: code:addons/mail/models/mail_channel.py:507
+#, python-format
+msgid ""
+"<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
+"href=\"#\" class=\"o_channel_redirect\" data-oe-"
+"id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:590
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -370,8 +186,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:508
-#: code:addons/mail/models/mail_channel.py:561
+#: code:addons/mail/models/mail_channel.py:514
+#: code:addons/mail/models/mail_channel.py:567
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -498,6 +314,11 @@ msgstr ""
 "                                    <span class=\"o_stat_text\">Acción del contexto</span>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+msgid "<span class=\"oe_inline\">days</span>"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>\n"
@@ -518,6 +339,13 @@ msgid "<strong> Feedback</strong>"
 msgstr "<strong/>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid ""
+"<strong>Internal communication</strong>: Replying will post an internal "
+"note. Followers won't receive any email notification."
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>Only records checked in list view will be used.</strong><br/>\n"
@@ -532,9 +360,9 @@ msgid "<strong>Recommended Activities</strong>"
 msgstr "<strong>Actividades recomendadas</strong>"
 
 #. 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_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
 msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
@@ -557,115 +385,118 @@ msgid "Access Groups"
 msgstr "Grupos de acceso"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction
 msgid "Action Needed"
 msgstr "Acción Necesaria"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__default
 msgid "Activated by default when subscribing."
 msgstr "Activado por defecto en la suscripción."
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__active
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_search
 msgid "Active"
 msgstr "Activo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__active_domain
 msgid "Active domain"
 msgstr "Dominio activo"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/systray.xml:87
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_ids
-#: model:ir.model.fields,field_description:mail.field_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.model.fields,field_description:mail.field_account_invoice__activity_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_ids
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
 #: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 #: model:mail.message.subtype,name:mail.mt_activities
@@ -677,7 +508,7 @@ msgstr "Actividades"
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:60
 #: model:ir.model,name:mail.model_mail_activity
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_type_id
+#: 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
@@ -691,6 +522,32 @@ msgid "Activity Mixin"
 msgstr "Mezcla de actividades"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_state
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_state
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_state
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_state
+msgid "Activity State"
+msgstr "Estado de la actividad"
+
+#. 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"
@@ -712,7 +569,7 @@ msgstr "Tipo de actividad"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:87
+#: code:addons/mail/static/src/xml/discuss.xml:87
 #, python-format
 msgid "Add"
 msgstr "Añadir"
@@ -720,7 +577,7 @@ msgstr "Añadir"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:64
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_channel_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__channel_ids
 #, python-format
 msgid "Add Channels"
 msgstr "Añadir canales"
@@ -728,7 +585,7 @@ msgstr "Añadir canales"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:61
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_partner_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
 msgid "Add Followers"
@@ -743,22 +600,28 @@ msgstr ""
 "electrónico"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,field_description:mail.field_mail_template_user_signature
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,field_description:mail.field_mail_template__user_signature
 msgid "Add Signature"
 msgstr "Añadir firma"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:41
-#: code:addons/mail/static/src/xml/client_action.xml:186
+#: code:addons/mail/static/src/xml/discuss.xml:41
+#: code:addons/mail/static/src/xml/discuss.xml:186
 #, python-format
 msgid "Add a channel"
 msgstr "Añadir un canal"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:335
+#, python-format
+msgid "Add a new %(document)s or send an email to %(email_link)s"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:60
+#: code:addons/mail/static/src/xml/discuss.xml:60
 #, python-format
 msgid "Add a private channel"
 msgstr "Añadir un canal privado"
@@ -775,7 +638,7 @@ msgid "Add contacts to notify..."
 msgstr "Añadir contactos a notificar..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
 msgid "Additional Contacts"
 msgstr "Contactos adicionales"
 
@@ -790,45 +653,45 @@ msgid "Advanced Settings"
 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_res_users_alias_id
+#: 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_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
 msgid "Alias"
 msgstr "Alias"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_contact
+#: 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
+#: model:ir.model.fields,field_description:mail.field_res_users__alias_contact
 msgid "Alias Contact Security"
 msgstr "Seudónimo del contacto de seguridad"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__alias_domain
 msgid "Alias Domain"
 msgstr "Seudónimo del dominio"
 
 #. module: mail
-#: 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_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
 msgid "Alias Name"
 msgstr "Seudónimo"
 
 #. module: mail
-#: 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_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
 msgid "Alias domain"
 msgstr "Seudónimo del dominio"
 
 #. module: mail
-#: 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_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
 msgid "Aliased Model"
 msgstr "Modelo con seudónimo"
 
@@ -853,16 +716,16 @@ msgstr "Siempre"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:198
+#: code:addons/mail/static/src/js/services/chat_manager.js:1328
 #, python-format
 msgid "Anonymous"
 msgstr "Anónimo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__no_auto_thread
 msgid ""
 "Answers do not go in the original document discussion thread. This has an "
 "impact on the generated message-id."
@@ -871,8 +734,8 @@ msgstr ""
 "tiene un impacto en el id del mensaje generado."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_id
 msgid "Applies to"
 msgstr "Aplica a"
 
@@ -884,9 +747,14 @@ msgid "Apply"
 msgstr "Aplicar"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+msgid "Archived"
+msgstr "Archivada"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:45
-#: model:ir.model.fields,field_description:mail.field_mail_activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
 #, python-format
 msgid "Assigned to"
 msgstr "Asignada a"
@@ -897,19 +765,19 @@ msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_template__attachment_ids
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Attachments"
 msgstr "Adjuntos"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_message_attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_message__attachment_ids
 msgid ""
 "Attachments are linked to a document through model / res_id and to the "
 "message through this field."
@@ -928,10 +796,10 @@ msgid "Authenticated Partners"
 msgstr "Empresas autenticadas"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_id
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Author"
 msgstr "Autor"
@@ -942,10 +810,10 @@ msgid "Author Signature (mass mail only)"
 msgstr "Firma del autor (sólo para envíos masivos)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,help:mail.field_mail_mail_author_id
-#: model:ir.model.fields,help:mail.field_mail_message_author_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,help:mail.field_mail_mail__author_id
+#: model:ir.model.fields,help:mail.field_mail_message__author_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_id
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that"
 " did not match any partner."
@@ -954,27 +822,27 @@ msgstr ""
 "dirección de correo que no coincida con la de ninguna empresa."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_avatar
 msgid "Author's avatar"
 msgstr "Avatar del autor"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_public_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_public_id
 msgid "Authorized Group"
 msgstr "Grupo autorizado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_template__auto_delete
 msgid "Auto Delete"
 msgstr "Auto eliminar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_ids
 msgid "Auto Subscription"
 msgstr "Auto suscripción"
 
@@ -996,16 +864,16 @@ msgid "Be careful with channels following internal notifications"
 msgstr "Tenga cuidado con los canales tras las notificaciones internas"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
-#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
 msgid "Body"
 msgstr "Contenido"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,field_description:mail.field_res_users_message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_users__message_bounce
 msgid "Bounce"
 msgstr "Rebote"
 
@@ -1051,36 +919,36 @@ msgid "Canned Response / Shortcode"
 msgstr "Respuesta preparada/ código corto"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_cc
+#: model:ir.model.fields,help:mail.field_mail_mail__email_cc
 msgid "Carbon copy message recipients"
 msgstr "Destinatarios en Copia Carbón del mensaje"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,help:mail.field_mail_template_email_cc
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,help:mail.field_mail_template__email_cc
 msgid "Carbon copy recipients (placeholders may be used here)"
 msgstr ""
 "Destinatarios para copia carbón (se pueden utilizar aquí expresiones de "
 "campos)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,help:mail.field_mail_activity_type_category
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,help:mail.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
 msgstr ""
 "Las categorías pueden desencadenar eventos específicos como abrir una vista "
 "de calendario"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__category
 msgid "Category"
 msgstr "Categoría"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_cc
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_cc
 msgid "Cc"
 msgstr "Cc"
 
@@ -1090,40 +958,40 @@ msgid "Change"
 msgstr "Cambiar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field
 msgid "Changed Field"
 msgstr "Campo cambiado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
 #: selection:mail.channel,channel_type:0
 msgid "Channel"
 msgstr "Canal"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_message_ids
 msgid "Channel Message"
 msgstr "Mensaje del canal"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_type
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_type
 msgid "Channel Type"
 msgstr "Tipo de canal"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:36
-#: code:addons/mail/static/src/xml/client_action.xml:172
+#: code:addons/mail/static/src/xml/discuss.xml:36
+#: code:addons/mail/static/src/xml/discuss.xml:172
 #: code:addons/mail/static/src/xml/systray.xml:19
 #: code:addons/mail/static/src/xml/systray.xml:36
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__channel_ids
 #: model:ir.ui.menu,name:mail.mail_channel_menu_settings
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
 #, python-format
@@ -1138,7 +1006,7 @@ msgstr "Canales/socios"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:168
+#: code:addons/mail/static/src/xml/discuss.xml:168
 #: code:addons/mail/static/src/xml/systray.xml:18
 #: code:addons/mail/static/src/xml/systray.xml:32
 #: model:ir.actions.client,name:mail.mail_channel_action_client_chat
@@ -1157,10 +1025,10 @@ msgid "Chat Shortcode"
 msgstr "Código corto de chat"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__child_ids
 msgid "Child Messages"
 msgstr "Mensajes hijos"
 
@@ -1170,24 +1038,6 @@ msgid "Choose an example"
 msgstr "Escoja un ejemplo"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:342
-#, python-format
-msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
-msgstr ""
-"Pulse para añadir un nuevo %(document)s o enviar un correo a: %(email_link)s"
-
-#. module: mail
-#: code:addons/mail/models/mail_thread.py:358
-#, python-format
-msgid "Click here to add new %s"
-msgstr "Pulse aquí para añadir un nuevo %s"
-
-#. module: mail
-#: model:ir.actions.act_window,help:mail.mail_shortcode_action
-msgid "Click to define a new chat shortcode."
-msgstr "Clic para definir un nuevo contacto"
-
-#. module: mail
 #: selection:mail.channel.partner,fold_state:0
 msgid "Closed"
 msgstr "Cerrado"
@@ -1203,8 +1053,8 @@ msgid "Comma-separated ids of recipient partners"
 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_mail_template_partner_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr "Ids de destinatarios separados por comas (pude usar \"marcadores\")"
@@ -1215,8 +1065,8 @@ msgid "Comma-separated recipient addresses"
 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_mail_template_email_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,help:mail.field_mail_template__email_to
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr ""
 "Destinatarios separados por comas (se pueden utilizar aquí expresiones de "
@@ -1237,8 +1087,8 @@ msgid "Compose Email"
 msgstr "Componer correo electrónico"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_composition_mode
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__composition_mode
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__composition_mode
 msgid "Composition mode"
 msgstr "Modo de composición"
 
@@ -1249,14 +1099,14 @@ msgstr "Configurar sus tipos de actividad"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:109
+#: code:addons/mail/static/src/xml/thread.xml:114
 #, python-format
 msgid "Congratulations, your inbox is empty"
 msgstr "¡Enhorabuena! Su bandeja de entrada está vacía."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:647
+#: code:addons/mail/static/src/js/discuss.js:662
 #, python-format
 msgid "Congratulations, your inbox is empty!"
 msgstr "¡Enhorabuena! Su bandeja de entrada está vacía."
@@ -1273,20 +1123,20 @@ msgid "Content"
 msgstr "Contenido"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_body
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body
-#: model:ir.model.fields,field_description:mail.field_mail_message_body
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_body
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__body
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body
+#: model:ir.model.fields,field_description:mail.field_mail_message__body
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__body
 msgid "Contents"
 msgstr "Contenidos"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_fold_state
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__fold_state
 msgid "Conversation Fold State"
 msgstr "Conversación plegada"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_minimized
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_minimized
 msgid "Conversation is minimized"
 msgstr "Conversación minimizada"
 
@@ -1298,65 +1148,71 @@ msgid "Conversations"
 msgstr "Conversaciones"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,help:mail.field_res_users_message_bounce
+#: model:ir.model.fields,help:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,help:mail.field_res_users__message_bounce
 msgid "Counter of the number of bounced emails for this contact"
 msgstr ""
 "Contador del número de correos electrónicos rebotados de este contacto"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:307
+#: code:addons/mail/static/src/js/discuss.js:318
 #, python-format
 msgid "Create %s"
 msgstr "Crear %s"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__create_date
 msgid "Create Date"
 msgstr "Fecha de Creación"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:350
+#, python-format
+msgid "Create a new %(document)s"
+msgstr ""
+
+#. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_uid
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:41
-#: 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
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_date
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_date
 #, python-format
 msgid "Created on"
 msgstr "Creado el"
@@ -1367,91 +1223,23 @@ msgid "Creation Month"
 msgstr "Mes de Creación"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,help:mail.field_mail_mail_starred
-#: model:ir.model.fields,help:mail.field_mail_message_starred
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_starred
+#: model:ir.model.fields,help:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,help:mail.field_mail_mail__starred
+#: model:ir.model.fields,help:mail.field_mail_message__starred
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__starred
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "El usuario actual tiene una notificación destacada asociada a este mensaje"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_date
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__date
+#: model:ir.model.fields,field_description:mail.field_mail_message__date
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__date
 msgid "Date"
 msgstr "Fecha"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,help:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,help:mail.field_event_event_message_last_post
-#: model:ir.model.fields,help:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,help:mail.field_event_track_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_track_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
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,help:mail.field_note_note_message_last_post
-#: model:ir.model.fields,help:mail.field_product_product_message_last_post
-#: model:ir.model.fields,help:mail.field_product_template_message_last_post
-#: model:ir.model.fields,help:mail.field_project_project_message_last_post
-#: model:ir.model.fields,help:mail.field_project_task_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,help:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,help:mail.field_res_users_message_last_post
-#: model:ir.model.fields,help:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,help:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr "Fecha del último mensaje publicado en el registro."
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Deadline"
 msgstr "Fecha límite"
@@ -1462,32 +1250,32 @@ msgid "Dear"
 msgstr "Querido"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__default
 msgid "Default"
 msgstr "Por defecto"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,field_description:mail.field_mail_template_null_value
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,field_description:mail.field_mail_template__null_value
 msgid "Default Value"
 msgstr "Valor por defecto"
 
 #. module: mail
-#: 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_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
 msgid "Default Values"
 msgstr "Valores por defecto"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__use_default_to
 msgid "Default recipients"
 msgstr "Destinatarios por defecto"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,help:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,help:mail.field_mail_template__use_default_to
 msgid ""
 "Default recipients of the record:\n"
 "- partner (using id on a partner or the partner_id field) OR\n"
@@ -1498,26 +1286,31 @@ msgstr ""
 "- Correo electrónico (usando los campos email_from o email)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.actions.act_window,help:mail.mail_shortcode_action
+msgid "Define a new chat shortcode"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete Emails"
 msgstr "Borrar correos"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete_message
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete_message
 msgid "Delete Message Copy"
 msgstr "Borrar copia del mensaje"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete sent emails (mass mailing only)"
 msgstr "Borrar correos enviados (solo envíos masivos)"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:320
+#: code:addons/mail/static/src/xml/thread.xml:325
 #, python-format
 msgid "Delete this attachment"
 msgstr "Eliminar este adjunto"
@@ -1528,15 +1321,15 @@ msgid "Delivery Failed"
 msgstr "Entrega fallida"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_description
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_description
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_description
+#: model:ir.model.fields,field_description:mail.field_mail_channel__description
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__description
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__description
 #: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
 msgid "Description"
 msgstr "Descripción"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_description
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__description
 msgid ""
 "Description that will be added in the message posted for this subtype. If "
 "void, the name will be added instead."
@@ -1546,7 +1339,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:46
+#: code:addons/mail/static/src/xml/discuss.xml:46
 #, python-format
 msgid "Direct Messages"
 msgstr "Mensajes directos"
@@ -1577,26 +1370,26 @@ msgid "Discussions"
 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_display_name
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__display_name
+#: 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_subtype__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_notification__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_thread__display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__display_name
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
@@ -1610,13 +1403,13 @@ msgstr ""
 "composición con esta plantilla"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_res_name
+#: model:ir.model.fields,help:mail.field_mail_activity__res_name
 msgid "Display name of the related document."
 msgstr "Mostrar el nombre del documento relacionado."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_auto_delete_message
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_auto_delete_message
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete_message
 msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
@@ -1630,7 +1423,12 @@ msgid "Document Followers"
 msgstr "Seguidores del documento"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_name
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_model_id
+msgid "Document Model"
+msgstr "Modelo de documento"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_name
 msgid "Document Name"
 msgstr "Nombre del documento"
 
@@ -1651,28 +1449,28 @@ msgstr "¡Hecho! Prepare el próximo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:296
+#: code:addons/mail/static/src/xml/thread.xml:301
 #, python-format
 msgid "Download this PDF"
 msgstr "Descargar este PDF"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:272
-#: code:addons/mail/static/src/xml/thread.xml:285
-#: code:addons/mail/static/src/xml/thread.xml:308
+#: code:addons/mail/static/src/xml/thread.xml:277
+#: code:addons/mail/static/src/xml/thread.xml:290
+#: code:addons/mail/static/src/xml/thread.xml:313
 #, python-format
 msgid "Download this attachment"
 msgstr "Descargar este adjunto"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity__date_deadline
 msgid "Due Date"
 msgstr "Fecha vencimiento"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:37
+#: code:addons/mail/static/src/js/activity.js:94
 #, python-format
 msgid "Due in %d days"
 msgstr "Vencido en %d días"
@@ -1704,7 +1502,7 @@ msgid "Edit subscription"
 msgstr "Editar subscripción"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_email
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_email
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 #: model:mail.activity.type,name:mail.mail_activity_data_email
 #: selection:mail.compose.message,message_type:0
@@ -1739,12 +1537,12 @@ 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
+#: model:ir.model.fields,field_description:mail.field_mail_notification__email_status
 msgid "Email Status"
 msgstr "Estado del correo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__template_id
 msgid "Email Template"
 msgstr "Plantilla de correo electrónico"
 
@@ -1764,7 +1562,7 @@ msgid "Email Thread"
 msgstr "Hilo de mensajes"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_alias_id
+#: model:ir.model.fields,help:mail.field_res_users__alias_id
 msgid ""
 "Email address internally associated with this user. Incoming emails will "
 "appear in the user's notifications."
@@ -1773,10 +1571,10 @@ msgstr ""
 "aparecerán como notificaciones de usuario."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_email_from
-#: model:ir.model.fields,help:mail.field_mail_mail_email_from
-#: model:ir.model.fields,help:mail.field_mail_message_email_from
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,help:mail.field_mail_compose_message__email_from
+#: model:ir.model.fields,help:mail.field_mail_mail__email_from
+#: model:ir.model.fields,help:mail.field_mail_message__email_from
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__email_from
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found and replaces the author_id field in the chatter."
@@ -1817,7 +1615,7 @@ msgstr ""
 "publicador."
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:302
+#: code:addons/mail/models/mail_mail.py:300
 #, python-format
 msgid ""
 "Error without exception. Probably due do sending an email without computed "
@@ -1858,7 +1656,7 @@ msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_fail_counter
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__fail_counter
 msgid "Fail Mail"
 msgstr "Correo Fallido"
 
@@ -1868,19 +1666,19 @@ msgid "Failed"
 msgstr "Fallido"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:374
+#: code:addons/mail/models/mail_template.py:368
 #, python-format
 msgid "Failed to render template %r using values %r"
 msgstr "Fallo al renderizar la plantilla %r usando los valores %r"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,field_description:mail.field_mail_mail__failure_reason
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Failure Reason"
 msgstr "Razón del fallo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
 msgid ""
 "Failure reason. This is usually the exception thrown by the email server, "
 "stored to ease the debugging of mailing issues."
@@ -1890,45 +1688,45 @@ msgstr ""
 " de correo."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred_partner_ids
 msgid "Favorited By"
 msgstr "Hecho Favorito por"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:215
-#: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
+#: code:addons/mail/static/src/js/activity.js:245
+#: model:ir.model.fields,field_description:mail.field_mail_activity__feedback
 #, python-format
 msgid "Feedback"
 msgstr "Comentarios"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_object_field
 msgid "Field"
 msgstr "Campo"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:24
+#: code:addons/mail/models/ir_model.py:30
 #, python-format
 msgid "Field \"Mail Thread\" cannot be changed to \"False\"."
 msgstr "El campo \"Hilo de mensajes\" no puede cambiarse a \"Falso\"."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_desc
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_desc
 msgid "Field Description"
 msgstr "Descripción campo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_type
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_type
 msgid "Field Type"
 msgstr "Tipo de campo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__relation_field
 msgid ""
 "Field used to link the related model to the subtype model when using "
 "automatic subscription on a related document. The field is used to compute "
@@ -1944,8 +1742,8 @@ msgid "Fields"
 msgstr "Campos"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,help:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,help:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,help:mail.field_mail_template__copyvalue
 msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
@@ -1960,7 +1758,6 @@ msgstr "Replegado"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:696
 #: code:addons/mail/static/src/xml/followers.xml:20
 #, python-format
 msgid "Follow"
@@ -1968,208 +1765,211 @@ msgstr "Seguir"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_followers
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_follower_ids
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: model:ir.ui.view,arch_db:mail.view_followers_tree
 msgid "Followers"
 msgstr "Seguidores"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_channel_ids
 msgid "Followers (Channels)"
 msgstr "Seguidores (Canales)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_partner_ids
 msgid "Followers (Partners)"
 msgstr "Seguidores (Empresas)"
 
@@ -2198,18 +1998,18 @@ 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
+#: 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 "Icono de Font Awesome ej. fa-tasks"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_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
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_from
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_from
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__email_from
 msgid "From"
 msgstr "De"
 
@@ -2232,7 +2032,7 @@ msgid "Gateway"
 msgstr "Pasarela"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:55
+#: code:addons/mail/models/res_users.py:54
 #, python-format
 msgid "Go to the configuration panel"
 msgstr "Ir al panel de configuración"
@@ -2275,49 +2075,54 @@ msgid "Has attachments"
 msgstr "Tiene adjuntos"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_headers
+#: model:ir.model.fields,field_description:mail.field_mail_mail__headers
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Headers"
 msgstr "Cabeceras"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_hidden
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Hello"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
 msgid "Hidden"
 msgstr "Oculto"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_hidden
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__hidden
 msgid "Hide the subtype in the follower options"
 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_id
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__id
+#: 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_subtype__id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__id
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__id
+#: model:ir.model.fields,field_description:mail.field_mail_template__id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__id
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mail
-#: 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_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
 msgid ""
 "ID of the parent record holding the alias (example: project holding the task"
 " creation alias)"
@@ -2326,163 +2131,165 @@ 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
+#: 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
+#: 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"
 msgstr "Id del recurso seguido"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:119
-#: code:addons/mail/static/src/xml/client_action.xml:203
+#: code:addons/mail/static/src/xml/discuss.xml:119
+#: code:addons/mail/static/src/xml/discuss.xml:203
 #, python-format
 msgid "Idle"
 msgstr "Ocioso"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,help:mail.field_event_event_message_unread
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread
-#: model:ir.model.fields,help:mail.field_event_track_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,help:mail.field_note_note_message_unread
-#: model:ir.model.fields,help:mail.field_product_product_message_unread
-#: model:ir.model.fields,help:mail.field_product_template_message_unread
-#: model:ir.model.fields,help:mail.field_project_project_message_unread
-#: model:ir.model.fields,help:mail.field_project_task_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread
-#: model:ir.model.fields,help:mail.field_res_users_message_unread
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,help:mail.field_event_event__message_unread
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread
+#: model:ir.model.fields,help:mail.field_event_track__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,help:mail.field_note_note__message_unread
+#: model:ir.model.fields,help:mail.field_product_product__message_unread
+#: model:ir.model.fields,help:mail.field_product_template__message_unread
+#: model:ir.model.fields,help:mail.field_project_project__message_unread
+#: model:ir.model.fields,help:mail.field_project_task__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread
+#: model:ir.model.fields,help:mail.field_res_users__message_unread
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread
 msgid "If checked new messages require your attention."
 msgstr "Si está marcado, hay nuevos mensajes que requieren su atención"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,help:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction
 msgid "If checked, new messages require your attention."
 msgstr "Si está marcado, hay nuevos mensajes que requieren su atención."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
 msgid ""
 "If checked, the partners will receive an email warning they have been added "
 "in the document's followers."
@@ -2491,8 +2298,8 @@ msgstr ""
 " de que han sido añadidos como seguidores del  documento."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,help:mail.field_mail_template_user_signature
+#: model:ir.model.fields,help:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,help:mail.field_mail_template__user_signature
 msgid ""
 "If checked, the user's signature will be appended to the text version of the"
 " message"
@@ -2501,8 +2308,8 @@ msgstr ""
 " mensaje"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_opt_out
-#: model:ir.model.fields,help:mail.field_res_users_opt_out
+#: model:ir.model.fields,help:mail.field_res_partner__opt_out
+#: model:ir.model.fields,help:mail.field_res_users__opt_out
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails for mass "
 "mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
@@ -2514,7 +2321,7 @@ msgstr ""
 "empresas cuando se realicen envíos masivos."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_mail__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible."
@@ -2524,8 +2331,8 @@ msgstr ""
 "posible."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_scheduled_date
-#: model:ir.model.fields,help:mail.field_mail_template_scheduled_date
+#: model:ir.model.fields,help:mail.field_email_template_preview__scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_template__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible. Jinja2 placeholders may be used."
@@ -2535,7 +2342,7 @@ msgstr ""
 "posible. Se tienen que utilizar los marcadores de posición Jinja2."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
 msgid ""
 "If you have setup a catch-all email domain redirected to the Odoo server, "
 "enter the domain name here."
@@ -2544,26 +2351,26 @@ msgstr ""
 "servidor de Odoo, ponga el nombre del dominio aquí."
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:141
+#: code:addons/mail/models/mail_alias.py:130
 #, python-format
 msgid "Inactive Alias"
 msgstr "Seudónimo inactivo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:655
-#: code:addons/mail/static/src/xml/client_action.xml:22
-#: code:addons/mail/static/src/xml/client_action.xml:154
-#: code:addons/mail/static/src/xml/client_action.xml:164
+#: code:addons/mail/static/src/js/services/chat_manager.js:84
+#: code:addons/mail/static/src/xml/discuss.xml:22
+#: code:addons/mail/static/src/xml/discuss.xml:154
+#: code:addons/mail/static/src/xml/discuss.xml:164
 #, python-format
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,help:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,help:mail.field_mail_message_parent_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,help:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,help:mail.field_mail_message__parent_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__parent_id
 msgid "Initial thread message."
 msgstr "Mensaje inicial del hilo"
 
@@ -2574,12 +2381,12 @@ msgid "Integrations"
 msgstr "Integraciones"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__internal
 msgid "Internal Only"
 msgstr "Solo interno"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:99
+#: code:addons/mail/models/mail_alias.py:88
 #, python-format
 msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
@@ -2589,7 +2396,8 @@ msgstr ""
 "'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1794
+#: code:addons/mail/models/mail_thread.py:1811
+#: code:addons/mail/models/mail_thread.py:1996
 #, python-format
 msgid ""
 "Invalid record set: should be called as model (without records) or on "
@@ -2599,14 +2407,14 @@ msgstr ""
 "registros) o en un registro único"
 
 #. module: mail
-#: code:addons/mail/controllers/main.py:41
+#: code:addons/mail/controllers/main.py:40
 #, python-format
 msgid "Invalid token in route %s"
 msgstr "Símbolo no valido en la ruta %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "Invitation"
 msgstr "Invitación"
@@ -2619,8 +2427,8 @@ msgstr "Invitación para seguir %s: %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:44
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:44
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite"
 msgstr "Invitar"
@@ -2634,15 +2442,15 @@ msgstr "Invitar seguidor"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:31
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:29
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite people"
 msgstr "Invitar gente"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:867
+#: code:addons/mail/static/src/js/discuss.js:882
 #, python-format
 msgid "Invite people to #%s"
 msgstr "Invitar personas a #%s"
@@ -2658,95 +2466,96 @@ msgid "Invited people only"
 msgstr "Personas invitadas solamente"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_note_note_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_product_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_template_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_project_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_task_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_users_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_note_note__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_product__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_template__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_project__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_task__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_users__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_is_follower
 msgid "Is Follower"
 msgstr "Es un seguidor"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification
+#: model:ir.model.fields,field_description:mail.field_mail_mail__notification
 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
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_read
 msgid "Is Read"
 msgstr "Es leído"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_subscribed
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_subscribed
 msgid "Is Subscribed"
 msgstr "Está suscrito"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_member
 msgid "Is a member"
 msgstr "Es un miembro"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
 msgid "Is pinned on the interface"
 msgstr "Está fijada en la interfaz"
 
@@ -2761,144 +2570,76 @@ msgid "Join a group"
 msgstr "Unirse a un grupo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_lang
-#: model:ir.model.fields,field_description:mail.field_mail_template_lang
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__lang
+#: model:ir.model.fields,field_description:mail.field_mail_template__lang
 msgid "Language"
 msgstr "Idioma"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_track_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_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_test_simple_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_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
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,field_description:mail.field_note_note_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_product_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_template_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_project_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_task_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_users_message_last_post
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_last_post
-msgid "Last Message Date"
-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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner___last_update
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message___last_update
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract___last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message____last_update
+#: 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_subtype____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_notification____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_template____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_thread____last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_last_seen_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_seen_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_last_seen_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__seen_message_id
 msgid "Last Seen"
 msgstr "Ultima vez visto"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_uid
-#: 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_tracking_value_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_uid
 msgid "Last Updated by"
 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_date
-#: 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_tracking_value_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_date
 msgid "Last Updated on"
 msgstr "Última actualización el"
 
@@ -2922,39 +2663,39 @@ msgstr "Ausencia"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:687
-#: code:addons/mail/static/src/xml/client_action.xml:112
+#: code:addons/mail/models/mail_channel.py:693
+#: code:addons/mail/static/src/xml/discuss.xml:112
 #, python-format
 msgid "Leave this channel"
 msgstr "Abandonar este canal"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_channel_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__channel_ids
 msgid ""
 "List of channels that will be added as listeners of the current document."
 msgstr ""
 "Lista de canales que serán añadidos como oyentes del documento actual."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__partner_ids
 msgid ""
 "List of partners that will be added as follower of the current document."
 msgstr ""
 "Lista de empresas que serán añadidas como seguidoras del documento actual."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:698
+#: code:addons/mail/models/mail_channel.py:704
 #, python-format
 msgid "List users in the current channel"
 msgstr "Listado actual de usuarios en este canal"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__channel_id
 msgid "Listener"
 msgstr "Oyente"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_partner_ids
 msgid "Listeners"
 msgstr "Oyentes"
 
@@ -2970,7 +2711,7 @@ msgstr "Conversación en directo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:31
+#: code:addons/mail/static/src/js/chatter_composer.js:30
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Log"
@@ -2994,8 +2735,8 @@ msgid "Log an Activity"
 msgstr "Registrar una actividad"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_is_log
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_is_log
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__is_log
 msgid "Log an Internal Note"
 msgstr "Registrar una nota interna"
 
@@ -3014,10 +2755,10 @@ msgid "Log or schedule an activity"
 msgstr "Registrar o planificar una actividad"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__mail_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__mail_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_activity_type_id
 msgid "Mail Activity Type"
 msgstr "Tipo de actividad del correo electrónico"
 
@@ -3027,13 +2768,13 @@ msgid "Mail Channel Form"
 msgstr "Formulario de canal de correo"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:369
+#: code:addons/mail/models/mail_mail.py:367
 #, python-format
 msgid "Mail Delivery Failed"
 msgstr "Fallo de entrega de correo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,field_description:mail.field_ir_model__is_mail_thread
 #: model:ir.ui.view,arch_db:mail.model_search_view
 msgid "Mail Thread"
 msgstr "Hilo de mensajes"
@@ -3044,7 +2785,7 @@ msgid "Mail Tracking Value"
 msgstr "Valor de seguimiento de correo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_notification
+#: model:ir.model.fields,help:mail.field_mail_mail__notification
 msgid "Mail has been created to notify people of an existing mail.message"
 msgstr ""
 "Se ha creado un correo electrónico para notificar a la gente de un mensaje "
@@ -3058,7 +2799,7 @@ msgid "Mail: Email Queue Manager"
 msgstr "Mail: Gestor de colas de email"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:832
+#: code:addons/mail/models/mail_thread.py:813
 #, python-format
 msgid "Mailbox unavailable - %s"
 msgstr "Bandeja no disponible - %s"
@@ -3077,14 +2818,14 @@ msgstr "Marcar como hecho"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all as read"
 msgstr "Marcar todo como leido"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all read"
 msgstr "Marcar todo como leido"
@@ -3096,15 +2837,15 @@ msgstr "Marcar como Hecho"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:206
+#: code:addons/mail/static/src/xml/thread.xml:211
 #, python-format
 msgid "Mark as Read"
 msgstr "Marcar como leido"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:153
-#: code:addons/mail/static/src/xml/thread.xml:200
+#: code:addons/mail/static/src/xml/thread.xml:158
+#: code:addons/mail/static/src/xml/thread.xml:205
 #, python-format
 msgid "Mark as Todo"
 msgstr "Marcar 'Por realizar'"
@@ -3117,12 +2858,12 @@ msgid "Mark as done"
 msgstr "Marcar como hecho"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_medium
 msgid "Medium-sized photo"
 msgstr "Foto de tamaño medio"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,help:mail.field_mail_channel__image_medium
 msgid ""
 "Medium-sized photo of the group. It is automatically resized as a 128x128px "
 "image, with aspect ratio preserved. Use this field in form views or some "
@@ -3144,7 +2885,7 @@ msgid "Members"
 msgstr "Socios"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,help:mail.field_mail_channel__group_ids
 msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
@@ -3154,16 +2895,22 @@ msgstr ""
 "necesario."
 
 #. module: mail
+#: code:addons/mail/wizard/base_partner_merge.py:13
+#, python-format
+msgid "Merged with the following partners:"
+msgstr "Combinada con las siguientes empresas:"
+
+#. 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.model.fields,field_description:mail.field_mail_mail__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Message"
 msgstr "Mensaje"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
 msgid "Message ID"
 msgstr "ID del mensaje"
 
@@ -3173,38 +2920,38 @@ msgid "Message Notifications"
 msgstr "Notificaciones de mensajes"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_mail__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_message__record_name
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__record_name
 msgid "Message Record Name"
 msgstr "Nombre de registro del mensaje"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__name
 msgid "Message Type"
 msgstr "Tipo de mensaje"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_to
+#: model:ir.model.fields,help:mail.field_mail_mail__email_to
 msgid "Message recipients (emails)"
 msgstr "Destinatarios del mensaje (correos electrónicos)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_references
+#: model:ir.model.fields,help:mail.field_mail_mail__references
 msgid "Message references, such as identifiers of previous messages"
 msgstr ""
 "Referencias del mensaje, tales como identificadores de mensajes anteriores"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
+#: code:addons/mail/static/src/xml/discuss.xml:124
 #, python-format
 msgid "Message sent in \""
 msgstr "Mensajes enviados en \""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__name
 msgid ""
 "Message subtype gives a more precise type on the message, especially for "
 "system notifications. For example, it can be a notification related to a new"
@@ -3224,7 +2971,7 @@ msgid "Message subtypes"
 msgstr "Subtipos de mensaje"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_followers_subtype_ids
+#: model:ir.model.fields,help:mail.field_mail_followers__subtype_ids
 msgid ""
 "Message subtypes followed, meaning subtypes that will be pushed onto the "
 "user's Wall."
@@ -3233,10 +2980,10 @@ msgstr ""
 "del usuario."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,help:mail.field_mail_mail_message_type
-#: model:ir.model.fields,help:mail.field_mail_message_message_type
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,help:mail.field_mail_mail__message_type
+#: model:ir.model.fields,help:mail.field_mail_message__message_type
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_type
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
@@ -3245,87 +2992,88 @@ msgstr ""
 "de sistema, comment para otros tipos de mensaje como respuestas de usuarios."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,help:mail.field_mail_mail_message_id
-#: model:ir.model.fields,help:mail.field_mail_message_message_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,help:mail.field_mail_mail__message_id
+#: model:ir.model.fields,help:mail.field_mail_message__message_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_id
 msgid "Message unique identifier"
 msgstr "Identificador único del mensaje"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_id
 msgid "Message-Id"
 msgstr "Id del mensaje"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_ids
 #: model:ir.ui.menu,name:mail.menu_mail_message
 #: model:ir.ui.view,arch_db:mail.view_message_tree
 msgid "Messages"
@@ -3346,7 +3094,7 @@ msgstr ""
 "tarde."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__internal
 msgid ""
 "Messages with internal subtypes will be visible only by employees, aka "
 "members of base_user group"
@@ -3355,20 +3103,20 @@ msgstr ""
 "también como a miembros del grupo base_user"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_res_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_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
 msgid "Model"
 msgstr "Modelo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_res_model
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__res_model
 msgid "Model of the followed resource"
 msgstr "Modelo del recurso seguido"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__res_model
 msgid ""
 "Model the subtype applies to. If False, this subtype applies to all models."
 msgstr ""
@@ -3397,25 +3145,25 @@ msgid "My Activities"
 msgstr "Mis actividades"
 
 #. 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_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.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Name"
 msgstr "Nombre"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_record_name
-#: model:ir.model.fields,help:mail.field_mail_mail_record_name
-#: model:ir.model.fields,help:mail.field_mail_message_record_name
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,help:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,help:mail.field_mail_mail__record_name
+#: model:ir.model.fields,help:mail.field_mail_message__record_name
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__record_name
 msgid "Name get of the related document."
 msgstr "Nombre obtenido del documento relacionado"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,help:mail.field_mail_template_report_name
+#: model:ir.model.fields,help:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,help:mail.field_mail_template__report_name
 msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
@@ -3424,71 +3172,71 @@ msgstr ""
 "La extensión puede ser omitida y se rellenará automáticamente desde el tipo de informe."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_mail_needaction
-#: model:ir.model.fields,help:mail.field_mail_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_mail__needaction
+#: model:ir.model.fields,help:mail.field_mail_message__needaction
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__needaction
 #: model:ir.ui.view,arch_db:mail.view_message_search
 msgid "Need Action"
 msgstr "Requiere acción"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_res_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
 msgid "Needaction Recipient"
 msgstr "Recipiente de la accion requerida"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:138
+#: code:addons/mail/static/src/xml/discuss.xml:138
 #, python-format
 msgid "New Channel"
 msgstr "Nuevo canal"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:137
+#: code:addons/mail/static/src/xml/discuss.xml:137
 #, python-format
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_char
 msgid "New Value Char"
 msgstr "Nuevo valor de carácter"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_datetime
 msgid "New Value Datetime"
 msgstr "Nuevo valor de fecha"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_float
 msgid "New Value Float"
 msgstr "Nuevo valor de coma flotante"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_integer
 msgid "New Value Integer"
 msgstr "Nuevo valor entero"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_monetary
 msgid "New Value Monetary"
 msgstr "Nuevo valor monetario"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_text
 msgid "New Value Text"
 msgstr "Nuevo valor de texto"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:55
-#: code:addons/mail/static/src/js/window_manager.js:139
+#: code:addons/mail/static/src/js/services/chat_manager.js:1625
+#: code:addons/mail/static/src/js/services/chat_window_manager.js:283
 #: code:addons/mail/static/src/xml/systray.xml:12
 #: code:addons/mail/static/src/xml/systray.xml:21
 #, python-format
@@ -3497,21 +3245,21 @@ msgstr "Nuevo mensaje"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:233
+#: code:addons/mail/static/src/xml/thread.xml:238
 #, python-format
 msgid "New messages"
 msgstr "Nuevo mensaje"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:110
+#: code:addons/mail/static/src/xml/thread.xml:115
 #, python-format
 msgid "New messages appear here."
 msgstr "Los mensajes nuevos se muestran aquí."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:97
+#: code:addons/mail/static/src/js/discuss.js:99
 #, python-format
 msgid "New people"
 msgstr "Nova gent"
@@ -3522,85 +3270,85 @@ msgid "Next Activities"
 msgstr "Siguientes actividades"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_date_deadline
 msgid "Next Activity Deadline"
 msgstr "Siguiente plazo de actividad"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_summary
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_summary
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_summary
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_summary
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_summary
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_summary
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_summary
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_summary
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_summary
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_summary
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_summary
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_summary
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_summary
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_summary
 msgid "Next Activity Summary"
 msgstr "Resumen de la siguiente actividad"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_type_id
 msgid "Next Activity Type"
 msgstr "Siguiente tipo de actividad"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,field_description:mail.field_mail_activity__has_recommended_activities
 msgid "Next activities available"
 msgstr "Siguientes actividades disponibles"
 
@@ -3644,28 +3392,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:113
+#: code:addons/mail/static/src/xml/thread.xml:118
 #, python-format
 msgid "No starred message"
 msgstr "Sin mensaje destacado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__no_auto_thread
 msgid "No threading for answers"
 msgstr "No hay un hilo para las respuestas"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_note
+#: model:ir.model.fields,field_description:mail.field_mail_activity__note
 #: model:mail.message.subtype,name:mail.mt_note
 msgid "Note"
 msgstr "Nota"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:157
+#: code:addons/mail/static/src/xml/thread.xml:162
 #, python-format
 msgid "Note by"
 msgstr "Nota de"
@@ -3676,100 +3424,101 @@ msgid "Notification"
 msgstr "Notificación"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_users_notification_type
+#: model:ir.model.fields,field_description:mail.field_res_users__notification_type
 msgid "Notification Management"
 msgstr "Gestión de 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
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers"
 msgstr "Notificar a los seguidores"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_notify
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_notify
+#: model:ir.model.fields,help:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers of the document (mass post only)"
 msgstr "Notificar a los seguidores del documento (sólo para envíos masivos)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of Actions"
 msgstr "Número de acciones"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_days
+#: 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."
@@ -3778,149 +3527,153 @@ msgstr ""
 " de la acción."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_payment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of messages which requires an action"
 msgstr "Número de mensajes que requieren una acción"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread_counter
 msgid "Number of unread messages"
 msgstr "Número de mensajes no leidos"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model:ir.ui.view,arch_db:mail.message_notification_email
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Odoo"
 msgstr "Odoo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:895
+#: code:addons/mail/static/src/js/discuss.js:910
 #, python-format
 msgid ""
 "Odoo has now the permission to send you native notifications on this device."
@@ -3930,14 +3683,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "Odoo needs your permission to"
 msgstr "Odoo necesita su permiso para"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:892
+#: code:addons/mail/static/src/js/discuss.js:907
 #, python-format
 msgid ""
 "Odoo will not have the permission to send native notifications on this "
@@ -3948,38 +3701,38 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:120
+#: code:addons/mail/static/src/xml/discuss.xml:120
 #, python-format
 msgid "Offline"
 msgstr "Desconectado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_char
 msgid "Old Value Char"
 msgstr "Valor de carácter antiguo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_datetime
 msgid "Old Value DateTime"
 msgstr "Valor de fecha y hora antiguo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_float
 msgid "Old Value Float"
 msgstr "Valor decimal antiguo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_integer
 msgid "Old Value Integer"
 msgstr "Valor antiguo del entero"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_monetary
 msgid "Old Value Monetary"
 msgstr "Valor monetario antiguo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_text
 msgid "Old Value Text"
 msgstr "Texto de valor antiguo"
 
@@ -4008,14 +3761,14 @@ msgstr "Un seguidor"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:118
-#: code:addons/mail/static/src/xml/client_action.xml:202
+#: code:addons/mail/static/src/xml/discuss.xml:118
+#: code:addons/mail/static/src/xml/discuss.xml:202
 #, python-format
 msgid "Online"
 msgstr "En línea"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:22
+#: code:addons/mail/models/ir_model.py:28
 #, python-format
 msgid "Only custom models can be modified."
 msgstr "Solo los modelos personalizados pueden ser modificados."
@@ -4037,14 +3790,14 @@ msgstr "Abrir el documento padre"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Open channel settings"
 msgstr "Abrir la configuración del canal"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:187
+#: code:addons/mail/static/src/xml/discuss.xml:187
 #, python-format
 msgid "Open chat"
 msgstr "Abrir chat"
@@ -4057,15 +3810,15 @@ msgid "Open in Discuss"
 msgstr "Abrir para debate"
 
 #. 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
+#: 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"
 msgstr "No acepta recibir mensajes"
 
 #. module: mail
-#: 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_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
 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 "
@@ -4076,8 +3829,8 @@ msgstr ""
 "deshabilitará completamente la creación de nuevos registros."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,help:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,help:mail.field_mail_template__mail_server_id
 msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
@@ -4086,14 +3839,14 @@ msgstr ""
 " de mayor prioridad."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_template
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_template
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_template
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_template
 msgid "Optional report to print and attach"
 msgstr "Informe opcional a generar y adjuntar"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_lang
-#: model:ir.model.fields,help:mail.field_mail_template_lang
+#: model:ir.model.fields,help:mail.field_email_template_preview__lang
+#: model:ir.model.fields,help:mail.field_mail_template__lang
 msgid ""
 "Optional translation language (ISO code) to select when sending out an "
 "email. If not set, the english version will be used. This should usually be "
@@ -4107,8 +3860,8 @@ msgstr ""
 "${object.partner_id.lang}."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,help:mail.field_mail_template_null_value
+#: model:ir.model.fields,help:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,help:mail.field_mail_template__null_value
 msgid "Optional value to use if the target field is empty"
 msgstr "Valor opcional a usar si el campo objetivo está vacío"
 
@@ -4123,8 +3876,8 @@ msgid "Outgoing"
 msgstr "Saliente"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__mail_server_id
 msgid "Outgoing Mail Server"
 msgstr "Servidor de correo saliente"
 
@@ -4134,10 +3887,10 @@ msgid "Outgoing Mails"
 msgstr "Correos salientes"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_server_id
 msgid "Outgoing mail server"
 msgstr "Servidor de correos salientes"
 
@@ -4151,12 +3904,12 @@ msgstr "Servidor de correos salientes"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4170,43 +3923,43 @@ msgid "Override author's email"
 msgstr "Sobreescribir correo electrónico del autor"
 
 #. module: mail
-#: 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_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
 msgid "Owner"
 msgstr "Propietario"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__parent_id
 msgid "Parent"
 msgstr "Padre"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__parent_id
 msgid "Parent Message"
 msgstr "Mensaje padre"
 
 #. module: mail
-#: 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_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
 msgid "Parent Model"
 msgstr "Modelo padre"
 
 #. module: mail
-#: 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_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
 msgid "Parent Record Thread ID"
 msgstr "ID del hilo del registro padre"
 
 #. module: mail
-#: 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_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
 msgid ""
 "Parent model holding the alias. The model holding the alias reference is not"
 " necessarily the model given by alias_model_id (example: project "
@@ -4217,7 +3970,7 @@ msgstr ""
 "project (parent_model) and task (model))"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__parent_id
 msgid ""
 "Parent subtype, used for automatic subscription. This field is not correctly"
 " named. For example on a project, the parent_id of project subtypes refers "
@@ -4246,17 +3999,17 @@ msgstr ""
 "correos"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction_partner_ids
 msgid "Partners with Need Action"
 msgstr "Asociados con acción requerida"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_template__auto_delete
 msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 "Eliminar definitiamente este e-mail después de enviarlo, para ahorrar "
@@ -4264,26 +4017,26 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:891
+#: code:addons/mail/static/src/js/discuss.js:906
 #, python-format
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:894
+#: code:addons/mail/static/src/js/discuss.js:909
 #, python-format
 msgid "Permission granted"
 msgstr "Permiso concedido"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image
 msgid "Photo"
 msgstr "Foto"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,field_description:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,field_description:mail.field_mail_template__copyvalue
 msgid "Placeholder Expression"
 msgstr "Expresión de marcador"
 
@@ -4297,12 +4050,12 @@ msgstr "Expresión de marcador"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4318,49 +4071,56 @@ msgid "Planned activities"
 msgstr "Actividades planificadas"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__days
+msgid "Planned in"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:282
+#: code:addons/mail/static/src/xml/thread.xml:287
 #, python-format
 msgid "Play this video"
 msgstr "Ver este video"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:158
+#: code:addons/mail/static/src/js/chatter_composer.js:157
 #, python-format
 msgid "Please complete customer's informations"
 msgstr "Por favor, complete la información del cliente"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:84
+#: code:addons/mail/static/src/js/many2many_tags_email.js:96
 #, python-format
 msgid "Please complete customer's informations and email"
 msgstr "Por favor, complete la información del cliente y el email"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Please contact us instead using"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Please, wait while the file is uploading."
 msgstr "Por favor, espere mientras sube el archivo."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_notification_type
+#: model:ir.model.fields,help:mail.field_res_users__notification_type
 msgid ""
 "Policy on how to handle Chatter notifications:\n"
-"- Emails: notifications are sent to your email\n"
-"- Odoo: notifications appear in your Odoo Inbox"
+"- Handle by Emails: notifications are sent to your email address\n"
+"- Handle in Odoo: notifications appear in your Odoo Inbox"
 msgstr ""
-"Política de gestión de notificaciones del chat:\n"
-"- Emails: las notificaciones son enviadas a su email\n"
-"- Odoo: las notificaciones aparecen en su bandeja de Odoo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_alias_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_channel_alias_contact
-#: model:ir.model.fields,help:mail.field_res_users_alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_channel__alias_contact
+#: model:ir.model.fields,help:mail.field_res_users__alias_contact
 msgid ""
 "Policy to post a message on the document using the mailgateway.\n"
 "- everyone: everyone can post\n"
@@ -4373,12 +4133,13 @@ msgstr ""
 "- seguidores: sólo seguidores del documento relacionado o miembros de los siguientes canales\n"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Powered by"
 msgstr "Con tecnología de"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_previous_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__previous_type_ids
 msgid "Preceding Activities"
 msgstr "Actividad precedente"
 
@@ -4388,8 +4149,8 @@ msgid "Preferred reply address"
 msgstr "Dirección de respuesta favorita"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,help:mail.field_mail_template_reply_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,help:mail.field_mail_template__reply_to
 msgid "Preferred response address (placeholders may be used here)"
 msgstr ""
 "Dirección de respuesta preferida (se pueden utilizar aquí expresiones de "
@@ -4406,27 +4167,27 @@ msgid "Preview of"
 msgstr "Vista previa de"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_previous_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__previous_activity_type_id
 msgid "Previous Activity Type"
 msgstr "Tipo de actividad previo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_public
+#: model:ir.model.fields,field_description:mail.field_mail_channel__public
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Privacy"
 msgstr "Privacidad"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:56
-#: code:addons/mail/static/src/xml/client_action.xml:176
+#: code:addons/mail/static/src/xml/discuss.xml:56
+#: code:addons/mail/static/src/xml/discuss.xml:176
 #, python-format
 msgid "Private Channels"
 msgstr "Canales privados"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:848
+#: code:addons/mail/static/src/js/discuss.js:863
 #, python-format
 msgid "Public Channels"
 msgstr "Canales públicos"
@@ -4455,68 +4216,72 @@ msgid "Received"
 msgstr "Recibido"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_id
 msgid "Recipient"
 msgstr "Destinatario"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Recipients"
 msgstr "Destinatarios"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_recommended_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__recommended_activity_type_id
 msgid "Recommended Activity Type"
 msgstr "Tipo recomendado de actividad"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_next_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__next_type_ids
 msgid "Recommended Next Activities"
 msgstr "Siguientes actividades recomendadas"
 
 #. module: mail
-#: 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_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
 msgid "Record Thread ID"
 msgstr "Id. del hijo de registro"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_references
+#: model:ir.model.fields,field_description:mail.field_mail_mail__references
 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
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_res_id
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Regards,"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__res_id
 msgid "Related Document ID"
 msgstr "ID del documento relacionado"
 
 #. 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_mail_model
-#: model:ir.model.fields,field_description:mail.field_mail_message_model
-#: model:ir.model.fields,field_description:mail.field_mail_template_model
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_model
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_model
+#: 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_compose_message__model
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_model
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__model
 msgid "Related Document Model"
 msgstr "Modelo de documento relacionado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_model
 msgid "Related Document Model Name"
 msgstr "Nombre del modelo del documento relacionado"
 
@@ -4526,12 +4291,12 @@ msgid "Related Message"
 msgstr "Mensaje relacionado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__partner_id
 msgid "Related Partner"
 msgstr "Empresa relacionada"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__relation_field
 msgid "Relation field"
 msgstr "Campo relación"
 
@@ -4551,17 +4316,17 @@ msgstr "Eliminar este seguidor"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:203
+#: code:addons/mail/static/src/xml/thread.xml:208
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Reply"
 msgstr "Responder"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,help:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,help:mail.field_mail_message_reply_to
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,help:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,help:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,help:mail.field_mail_message__reply_to
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__reply_to
 msgid ""
 "Reply email address. Setting the reply_to bypasses the automatic thread "
 "creation."
@@ -4570,46 +4335,46 @@ msgstr ""
 "la creación automática de hilos."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_reply_to
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__reply_to
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__reply_to
 msgid "Reply-To"
 msgstr "Responder a"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_name
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_name
 msgid "Report Filename"
 msgstr "Fichero del informe"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_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"
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_user_id
+msgid "Responsible User"
+msgstr "Usuario responsable"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
@@ -4618,12 +4383,12 @@ msgid "Retry"
 msgstr "Reintentar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body_html
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body_html
 msgid "Rich-text Contents"
 msgstr "Contenido con texto enriquecido"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_body_html
+#: model:ir.model.fields,help:mail.field_mail_mail__body_html
 msgid "Rich-text/HTML message"
 msgstr "Mensaje en Texto enriquecido/HTML"
 
@@ -4633,7 +4398,7 @@ msgid "SMTP Server"
 msgstr "Servidor SMTP"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_res_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__res_id
 msgid "Sample Document"
 msgstr "Documento ejemplo"
 
@@ -4667,26 +4432,26 @@ msgid "Schedule activity"
 msgstr "Planificar actividad"
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:250
+#: code:addons/mail/models/mail_activity.py:260
 #, python-format
 msgid "Schedule an Activity"
 msgstr "Planificar una actividad"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:57
 #, python-format
 msgid "Schedule an activity"
 msgstr "Planificar una actividad"
 
 #. 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
+#: 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"
 msgstr "Fecha prevista"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__scheduled_date
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Scheduled Send Date"
 msgstr "Fecha planeada de envió"
@@ -4702,8 +4467,8 @@ msgid "Search Groups"
 msgstr "Grupos de busqueda"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__model_object_field
 msgid ""
 "Select target field from the related document model.\n"
 "If it is a relationship field you will be able to select a target field at the destination of the relationship."
@@ -4718,19 +4483,19 @@ msgstr "Grupo de usuarios seleccionado"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:374
+#: code:addons/mail/static/src/js/composer.js:428
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Send"
 msgstr "Enviar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail
 msgid "Send Email"
 msgstr "Enviar correo electrónico"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:264
+#: code:addons/mail/models/mail_template.py:295
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Enviar mail (%s)"
@@ -4756,13 +4521,13 @@ msgid "Send message"
 msgstr "Enviar mensaje"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
+#: model:ir.model.fields,field_description:mail.field_mail_channel__email_send
 msgid "Send messages by email"
 msgstr "Enviar mensajes por correo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_from
-#: model:ir.model.fields,help:mail.field_mail_template_email_from
+#: model:ir.model.fields,help:mail.field_email_template_preview__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 "
 "value will be the author's email alias if configured, or email address."
@@ -4773,14 +4538,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Sending Error"
 msgstr "Error en el envío"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:108
+#: code:addons/mail/static/src/xml/discuss.xml:108
 #, python-format
 msgid "Sends messages by email"
 msgstr "Enviar mensaje por correo electrónico"
@@ -4792,25 +4557,30 @@ msgid "Sent"
 msgstr "Enviado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_email
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "Sent by"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_email
 msgid "Sent by Email"
 msgstr "Enviado por correo"
 
 #. 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
+#: 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"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Settings"
 msgstr "Configuración"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__shortcode_type
 msgid "Shortcode Type"
 msgstr "Tipo de codigo corto"
 
@@ -4821,7 +4591,7 @@ msgid "Shortcodes"
 msgstr "Codigos cortos"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__source
 msgid "Shortcut"
 msgstr "Acceso rápido"
 
@@ -4834,20 +4604,20 @@ msgstr ""
 "hoy"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:667
+#: code:addons/mail/models/mail_channel.py:673
 #, python-format
 msgid "Show an helper message"
 msgstr "Mostrar un mensaje de ayuda"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,field_description:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_mail_template__ref_ir_act_window
 msgid "Sidebar action"
 msgstr "Acción barra lateral"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,help:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_mail_template__ref_ir_act_window
 msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
@@ -4856,10 +4626,10 @@ msgstr ""
 "registros del modelo de documento relacionado"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_avatar
 msgid ""
 "Small-sized image of this contact. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4870,12 +4640,12 @@ msgstr ""
 "requiera una imagen pequeña."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_small
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_small
 msgid "Small-sized photo"
 msgstr "Foto pequeña"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_small
+#: model:ir.model.fields,help:mail.field_mail_channel__image_small
 msgid ""
 "Small-sized photo of the group. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4891,7 +4661,7 @@ msgid "Smiley"
 msgstr "Smiley"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_res_model_id
+#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_id
 msgid ""
 "Specify a model if the activity should be specific to a model and not "
 "available when managing activities for other models."
@@ -4901,74 +4671,52 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:661
-#: code:addons/mail/static/src/xml/client_action.xml:28
-#: code:addons/mail/static/src/xml/client_action.xml:156
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred
+#: code:addons/mail/static/src/js/services/chat_manager.js:89
+#: code:addons/mail/static/src/xml/discuss.xml:28
+#: code:addons/mail/static/src/xml/discuss.xml:156
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred
 #, python-format
 msgid "Starred"
 msgstr "Destacado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_state
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_state
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_mail_activity__state
 msgid "State"
 msgstr "Estado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_state
+#: 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
 msgid "Status"
 msgstr "Estado"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,help:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,help:mail.field_event_track_activity_state
-#: model:ir.model.fields,help:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,help:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,help:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,help:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,help:mail.field_product_template_activity_state
-#: model:ir.model.fields,help:mail.field_project_task_activity_state
-#: model:ir.model.fields,help:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,help:mail.field_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
+#: model:ir.model.fields,help:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,help:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,help:mail.field_event_track__activity_state
+#: model:ir.model.fields,help:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,help:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,help:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,help:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,help:mail.field_note_note__activity_state
+#: model:ir.model.fields,help:mail.field_product_product__activity_state
+#: model:ir.model.fields,help:mail.field_product_template__activity_state
+#: model:ir.model.fields,help:mail.field_project_task__activity_state
+#: model:ir.model.fields,help:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,help:mail.field_repair_order__activity_state
+#: model:ir.model.fields,help:mail.field_res_partner__activity_state
+#: model:ir.model.fields,help:mail.field_res_users__activity_state
+#: model:ir.model.fields,help:mail.field_sale_order__activity_state
+#: model:ir.model.fields,help:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,help:mail.field_survey_survey__activity_state
 msgid ""
 "Status based on activities\n"
 "Overdue: Due date is already passed\n"
@@ -4981,33 +4729,33 @@ msgstr ""
 "Planificada: futuras actividades."
 
 #. 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
+#: 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"
 msgstr "Sub-campo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,field_description:mail.field_mail_template_sub_object
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,field_description:mail.field_mail_template__sub_object
 msgid "Sub-model"
 msgstr "Sub-modelo"
 
 #. module: mail
 #. 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_mail_compose_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_mail_subject
-#: model:ir.model.fields,field_description:mail.field_mail_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_template_subject
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subject
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__subject
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_mail__subject
+#: model:ir.model.fields,field_description:mail.field_mail_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_template__subject
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subject
 #, python-format
 msgid "Subject"
 msgstr "Asunto"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_subject
-#: model:ir.model.fields,help:mail.field_mail_template_subject
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr "Asunto (se pueden utilizar aquí expresiones de campos)"
@@ -5019,22 +4767,22 @@ msgstr "Asunto..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:216
+#: code:addons/mail/static/src/xml/thread.xml:221
 #, python-format
 msgid "Subject:"
 msgstr "Asunto:"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_substitution
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__substitution
 msgid "Substitution"
 msgstr "Sustitución"
 
 #. module: mail
-#: 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_1993
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subtype_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subtype_id
 #: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
 msgid "Subtype"
 msgstr "Subtipo"
@@ -5046,8 +4794,8 @@ 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
+#: 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"
 
@@ -5059,7 +4807,7 @@ msgid "System notification"
 msgstr "Notificación del sistema"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,help:mail.field_mail_activity__has_recommended_activities
 msgid "Technical field for UX purpose"
 msgstr "Campo técnico para fines UX"
 
@@ -5069,6 +4817,14 @@ msgid "Template Preview"
 msgstr "Vista previa plantilla"
 
 #. module: mail
+#: code:addons/mail/models/mail_template.py:264
+#, python-format
+msgid ""
+"Template rendering failed, this could mean that your template contains "
+"python syntax errors"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_template_tree_all
 #: model:ir.ui.menu,name:mail.menu_email_templates
 #: model:ir.ui.view,arch_db:mail.email_template_form
@@ -5078,14 +4834,24 @@ msgid "Templates"
 msgstr "Plantillas"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The"
+msgstr "El"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The email sent to"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_shortcode__substitution
 msgid "The escaped html code replacing the shortcut"
 msgstr "El código html escapado que reemplaza el acceso directo"
 
 #. module: mail
-#: 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_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
 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 "
@@ -5097,9 +4863,9 @@ msgstr ""
 "tarea de proyecto)."
 
 #. module: mail
-#: 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_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
 msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
@@ -5109,9 +4875,9 @@ msgstr ""
 "<trabajos@example.odoo.com>."
 
 #. module: mail
-#: 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_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
 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 "
@@ -5125,9 +4891,9 @@ msgstr ""
 "dirección."
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:165
-#: code:addons/mail/models/mail_message.py:579
-#: code:addons/mail/models/mail_message.py:674
+#: code:addons/mail/models/mail_activity.py:175
+#: code:addons/mail/models/mail_message.py:578
+#: code:addons/mail/models/mail_message.py:678
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -5139,19 +4905,19 @@ msgstr ""
 "(Tipo de documento: %s, Operación: %s)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__source
 msgid "The shortcut which must be replaced in the Chat Messages"
 msgstr "El atajo que debe ser reemplazado en los mensajes de chat"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__unicode_source
 msgid "The source is replaced by this unicode character in the Chat Messages"
 msgstr ""
 "La fuente es remplazada por este carácter unicode en los mensajes del chat"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,help:mail.field_mail_template_model_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,help:mail.field_mail_template__model_id
 msgid "The type of document this template can be used with"
 msgstr "El tipo de plantilla de este documento puede ser usado con"
 
@@ -5161,7 +4927,7 @@ msgid "This"
 msgstr "Este"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image
+#: model:ir.model.fields,help:mail.field_mail_channel__image
 msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
@@ -5170,7 +4936,7 @@ msgstr ""
 "1024x1024px."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_public
+#: model:ir.model.fields,help:mail.field_mail_channel__public
 msgid ""
 "This group is visible by non members. Invisible groups can add members "
 "through the invite button."
@@ -5184,20 +4950,20 @@ msgid "Thread"
 msgstr "Hilo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_to
 msgid "To"
 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_mail_template_email_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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_mail_mail_recipient_ids
-#: model:ir.model.fields,field_description:mail.field_mail_template_partner_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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)"
 msgstr "A (empresas)"
 
@@ -5212,8 +4978,8 @@ msgstr "Para:"
 #. module: mail
 #. openerp-web
 #: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:25
-#: code:addons/mail/static/src/js/thread.js:242
+#: code:addons/mail/static/src/js/activity.js:82
+#: code:addons/mail/static/src/js/thread.js:328
 #: code:addons/mail/static/src/xml/systray.xml:75
 #: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
 #: selection:hr.applicant,activity_state:0
@@ -5223,12 +4989,12 @@ msgstr "Para:"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -5250,7 +5016,7 @@ msgstr "Pendiente"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:35
+#: code:addons/mail/static/src/js/activity.js:92
 #, python-format
 msgid "Tomorrow"
 msgstr "Mañana"
@@ -5261,10 +5027,10 @@ msgid "Topics discussed in this group..."
 msgstr "Temas discutidos en este grupo..."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid ""
 "Tracked values are stored in a separate model. This field allow to "
 "reconstruct the tracking and to generate statistics on the model."
@@ -5273,7 +5039,7 @@ msgstr ""
 "permite reconstruir el seguimiento y generar estadísticas en el modelo."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,field_description:mail.field_ir_model_fields__track_visibility
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Tracking"
 msgstr "Seguimiento"
@@ -5291,28 +5057,28 @@ msgid "Tracking Values"
 msgstr "Valores de seguimiento"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid "Tracking values"
 msgstr "Valores de seguimiento"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_type
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_type
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_uuid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__uuid
 msgid "UUID"
 msgstr "UUID"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:235
+#: code:addons/mail/models/mail_mail.py:233
 #, python-format
 msgid "Unable to connect to SMTP Server"
 msgstr "Imposible conectar con el servidor SMTP"
@@ -5327,7 +5093,6 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:700
 #: code:addons/mail/static/src/xml/followers.xml:22
 #, python-format
 msgid "Unfollow"
@@ -5342,143 +5107,145 @@ msgstr ""
 "elija otro."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__unicode_source
 msgid "Unicode Character"
 msgstr "Carácter unicode"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread
 msgid "Unread Messages"
 msgstr "Mensajes por leer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread_counter
 msgid "Unread Messages Counter"
 msgstr "Contador de mensajes sin leer"
 
@@ -5489,61 +5256,61 @@ msgstr "Mensajes pendientes de leer"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all"
 msgstr "Desmarcar todos"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all messages"
 msgstr "Desmarcar todos los mensajes"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe"
 msgstr "Anular subscripción"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe from channel"
 msgstr "Darse de baja del canal"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:510
+#: code:addons/mail/models/mail_template.py:504
 #, python-format
 msgid "Unsupported report type %s found."
 msgstr "Tipo de informe desconocido %s."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:322
+#: code:addons/mail/static/src/xml/thread.xml:327
 #, python-format
 msgid "Uploading"
 msgstr "Subiendo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Uploading error"
 msgstr "Error de subida"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_use_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_use_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__use_active_domain
 msgid "Use active domain"
 msgstr "Usar el dominio activo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_template_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_template_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__template_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__template_id
 msgid "Use template"
 msgstr "Usar plantilla"
 
@@ -5553,7 +5320,7 @@ msgid "Use your own email servers"
 msgstr "Utilice sus propios servidores de correo electrónico"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_sequence
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__sequence
 msgid "Used to order subtypes."
 msgstr "Usado para ordenar los subtipos."
 
@@ -5566,7 +5333,7 @@ msgstr "Usuario"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:51
+#: code:addons/mail/static/src/xml/discuss.xml:51
 #: code:addons/mail/static/src/xml/extended_chat_window.xml:8
 #, python-format
 msgid "User name"
@@ -5578,7 +5345,7 @@ msgid "Users"
 msgstr "Usuarios"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:711
+#: code:addons/mail/models/mail_channel.py:717
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Usuarios en este canal: %s %s y usted."
@@ -5596,14 +5363,14 @@ msgstr ""
 "usar (@mycompany.odoo.com)."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:670
+#: code:addons/mail/models/mail_thread.py:696
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 #, python-format
 msgid "View"
 msgstr "Ver"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:668
+#: code:addons/mail/models/mail_thread.py:694
 #, python-format
 msgid "View %s"
 msgstr ""
@@ -5622,8 +5389,8 @@ msgstr ""
 "¿Realmente lo quiere eliminar?"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_sub_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__sub_model_object_field
 msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
@@ -5633,8 +5400,8 @@ msgstr ""
 "modelo)."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,help:mail.field_mail_template_sub_object
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,help:mail.field_mail_template__sub_object
 msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
@@ -5643,20 +5410,20 @@ msgstr ""
 "muestra el modelo de documento al que apunta la relación."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,help:mail.field_ir_model_fields__track_visibility
 msgid ""
 "When set, every modification to this field will be tracked in the chatter."
 msgstr ""
 "Si se marca, cualquier modificación del campo será seguida en el chat."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_is_log
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_is_log
+#: model:ir.model.fields,help:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__is_log
 msgid "Whether the message is an internal note (comment mode only)"
 msgstr "Si el mensaje es una nota interna (sólo en modo de comentario)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,help:mail.field_ir_model__is_mail_thread
 msgid "Whether this model supports messages and notifications."
 msgstr "Si este modelo soporta mensajería y notificaciones."
 
@@ -5674,47 +5441,47 @@ msgstr "Escribir comentarios"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:12
+#: code:addons/mail/static/src/xml/composer.xml:11
 #, python-format
-msgid "Write something..."
-msgstr "Escriba algo..."
+msgid "Write Something..."
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:29
-#: code:addons/mail/static/src/js/thread.js:244
+#: code:addons/mail/static/src/js/activity.js:86
+#: code:addons/mail/static/src/js/thread.js:330
 #, python-format
 msgid "Yesterday"
 msgstr "Ayer"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:96
+#: code:addons/mail/static/src/js/discuss.js:98
 #, python-format
 msgid "You added <b>%s</b> to the conversation."
 msgstr "Ha añadido a <b>%s<b> a esta conversación."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:708
+#: code:addons/mail/models/mail_channel.py:714
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Está solo en este canal."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:677
+#: code:addons/mail/models/mail_channel.py:683
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "Esta en una conversación privada con <b>@%s</s>."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:672
+#: code:addons/mail/models/mail_channel.py:678
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Esta en el canal <b>#%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:114
+#: code:addons/mail/static/src/xml/thread.xml:119
 #, python-format
 msgid ""
 "You can mark any message as 'starred', and it shows up in this channel."
@@ -5723,7 +5490,7 @@ msgstr ""
 "canal."
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:54
+#: code:addons/mail/models/res_users.py:53
 #, python-format
 msgid ""
 "You cannot create a new user from here.\n"
@@ -5743,14 +5510,11 @@ msgstr ""
 "requerido por otros módulos."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:349
+#: code:addons/mail/models/mail_thread.py:342
 #, python-format
 msgid ""
-"You could also add a new %(document)s by sending an email to: "
-"%(email_link)s."
+"You could also add a new %(document)s by sending an email to %(email_link)s"
 msgstr ""
-"Puede añadir también un nuevo %(document)s enviando un correo a : "
-"%(email_link)s."
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
@@ -5759,14 +5523,14 @@ msgstr "Has sido asignado al"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "You have been invited to: "
 msgstr "Has sido invitado a:"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,help:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_template__attachment_ids
 msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
@@ -5776,28 +5540,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:473
+#: code:addons/mail/static/src/js/services/chat_manager.js:1536
 #, python-format
 msgid "You unpinned your conversation with <b>%s</b>."
 msgstr "Desvinculaste tu conversación con <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:471
+#: code:addons/mail/static/src/js/services/chat_manager.js:1534
 #, python-format
 msgid "You unsubscribed from <b>%s</b>."
 msgstr "Se ha dado de baja de <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:217
+#: code:addons/mail/static/src/xml/discuss.xml:217
 #, python-format
 msgid "You:"
 msgstr "Usted:"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Your message has not been sent."
 msgstr "Su mensaje no se ha enviado."
@@ -5809,23 +5573,35 @@ msgid "Your template should define email_from"
 msgstr "Su plantilla debería definir email_from"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "alias %s: %s"
 msgstr "alias %s: %s"
 
 #. module: mail
+#: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
+msgid "base.partner.merge.automatic.wizard"
+msgstr "base.partner.merge.automatic.wizard"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "by"
 msgstr "por"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid ""
+"cannot be processed. This address\n"
+"    is used to collect replies and should not be used to directly contact"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "creado"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:315
+#: code:addons/mail/models/mail_thread.py:309
 #, python-format
 msgid "document"
 msgstr "documento"
@@ -5846,7 +5622,7 @@ msgstr "Por ejemplo, discusión de una propuesta"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "enable desktop notifications"
 msgstr "habilitar notificaciones de escritorio"
@@ -5881,13 +5657,13 @@ msgid "has been"
 msgstr "ha sido"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:282
+#: code:addons/mail/models/mail_alias.py:271
 #, python-format
 msgid "incorrectly configured alias"
 msgstr "alias configurado incorrectamente"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:278
+#: code:addons/mail/models/mail_alias.py:267
 #, python-format
 msgid "incorrectly configured alias (unknown reference record)"
 msgstr "alias configurado incorrectamente (registro de referencia incorrecto)"
@@ -5908,19 +5684,19 @@ msgid "mail.alias.mixin"
 msgstr "mail.alias.mixin"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:943
+#: code:addons/mail/models/mail_thread.py:925
 #, python-format
 msgid "model %s does not accept document creation"
 msgstr "modelo %s no acepta la creación de documentos"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:938
+#: code:addons/mail/models/mail_thread.py:920
 #, python-format
 msgid "model %s does not accept document update"
 msgstr "modelo %s no acepta la actualización de documento"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:931
+#: code:addons/mail/models/mail_thread.py:913
 #, python-format
 msgid ""
 "model %s does not accept document update, fall back on document creation"
@@ -5947,14 +5723,14 @@ msgstr "ahora"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:177
+#: code:addons/mail/static/src/xml/thread.xml:181
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "on"
 msgstr "en"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid ""
 "posting a message without model should be with a null res_id (private "
@@ -5964,7 +5740,7 @@ msgstr ""
 "privado), recibido %s"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:917
+#: code:addons/mail/models/mail_thread.py:899
 #, python-format
 msgid ""
 "posting a message without model should be with a parent_id (private message)"
@@ -5997,13 +5773,13 @@ msgid "record:"
 msgstr "registro:"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:935
+#: code:addons/mail/models/mail_thread.py:917
 #, python-format
 msgid "reply to missing document (%s,%s)"
 msgstr "responder al documento faltante (%s,%s)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:928
+#: code:addons/mail/models/mail_thread.py:910
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
 msgstr ""
@@ -6016,40 +5792,45 @@ msgid "res.config.settings"
 msgstr "res.config.settings"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid "resetting thread_id"
 msgstr "restablecer thread_id"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:254
+#: code:addons/mail/models/mail_channel.py:252
 #, python-format
 msgid "restricted to channel members"
 msgstr "Restringido a miembros del canal"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:287
+#: code:addons/mail/models/mail_alias.py:276
 #, python-format
 msgid "restricted to followers"
 msgstr "Restringido a seguidores"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:291
+#: code:addons/mail/models/mail_alias.py:280
 #, python-format
 msgid "restricted to known authors"
 msgstr "restringido a autores conocidos"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:899
 #: code:addons/mail/models/mail_thread.py:917
-#: code:addons/mail/models/mail_thread.py:935
-#: code:addons/mail/models/mail_thread.py:938
-#: code:addons/mail/models/mail_thread.py:943
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:920
+#: code:addons/mail/models/mail_thread.py:925
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "skipping"
 msgstr "Saltando"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "team."
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:20
 #, python-format
@@ -6057,13 +5838,18 @@ msgid "this document"
 msgstr "este documento"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "unknown error"
 msgstr "error desconocido"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:906
+#: code:addons/mail/models/mail_thread.py:888
 #, python-format
 msgid "unknown target model %s"
 msgstr "modelo de destino desconocido %s"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "using"
+msgstr ""
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 78c216783ef..475ac7a5187 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Martin Malorni <mmalorni@gmail.com>, 2016
 # Clo <clo@odoo.com>, 2016
 # Agathe Mollé <molleagathe@gmail.com>, 2016
@@ -13,7 +13,7 @@
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Quentin THEURET <odoo@kerpeo.com>, 2016
-# ShevAbam <shevabam@gmail.com>, 2016
+# ShevAbam, 2016
 # lucasdeliege <deliegelucas@gmail.com>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
 # Nicolas Martinelli <nim@odoo.com>, 2016
@@ -33,7 +33,7 @@
 # Shark McGnark <peculiarcheese@gmail.com>, 2016
 # Daniel & Delphine <dd2013@leschoupinous.net>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Jeanjean Noname <monsieur.spock@gmail.com>, 2016
 # Hubert TETARD <htetard@apik-conseils.com>, 2017
 # Henri Cornuau <hcornuau@gmail.com>, 2017
@@ -46,13 +46,16 @@
 # fr rev <e2ffr02@hotmail.com>, 2017
 # Bertrand LATOUR <divoir@gmail.com>, 2017
 # fr rev <e2ffr04@hotmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
+# Christophe Dubuit <cdubuit@yahoo.com>, 2018
+# Jérémy Donas <LeDistordu@users.noreply.github.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.1\n"
+"Project-Id-Version: Odoo Server saas~11.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-13 14:36+0000\n"
-"PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: fr rev <e2ffr04@hotmail.com>, 2017\n"
+"POT-Creation-Date: 2018-03-22 14:10+0000\n"
+"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"Last-Translator: Jérémy Donas <LeDistordu@users.noreply.github.com>, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,254 +64,59 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_data_notification_email_default
-msgid ""
-"\n"
-"% set company = ctx.get('company', user.company_id)\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"
-"        <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-"        <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
-"    </div>\n"
-"</div>\n"
-"% endif\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('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('has_button_follow'):\n"
-"        % if ctx.get('has_button_access'):\n"
-"           |\n"
-"        % endif\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=\"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=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
-"        % endfor\n"
-"        % endif\n"
-"    </td>\n"
-"    <td valign=\"center\" align=\"right\">\n"
-"        <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\">\n"
-"    </td>\n"
-"</tr>\n"
-"<tr>\n"
-"    <td colspan=\"2\" style=\"text-align:center;\">\n"
-"        <hr width=\"100%\"\n"
-"            style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
-"        % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
-"        <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n"
-"            <strong>Internal communication</strong>: Replying will post an internal note. Followers won't receive any email notification.\n"
-"        </p>\n"
-"        % endif\n"
-"    </td>\n"
-"</tr>\n"
-"</tbody></table>\n"
-"</div>\n"
-"% endif\n"
-"<div>\n"
-"    ${object.body | safe}\n"
-"</div>\n"
-"% if ctx.get('tracking'):\n"
-"    <ul>\n"
-"    % for tracking in ctx['tracking']\n"
-"        <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
-"    % endfor\n"
-"    </ul>\n"
-"% endif\n"
-"\n"
-"% if ctx.get('signature'):\n"
-"    ${ctx['signature'] | safe}\n"
-"% endif\n"
-"<br/>\n"
-"<p style=\"color: #555555;\">\n"
-"    Sent by\n"
-"    % if ctx.get('website_url'):\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 target=\"_blank\" href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\">Odoo</a>.\n"
-"</p>\n"
-"</div>"
-msgstr ""
-"\n"
-"% set company = ctx.get('company', user.company_id)\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"
-"        <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-"        <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
-"    </div>\n"
-"</div>\n"
-"% endif\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('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('has_button_follow'):\n"
-"        % if ctx.get('has_button_access'):\n"
-"           |\n"
-"        % endif\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=\"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=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
-"        % endfor\n"
-"        % endif\n"
-"    </td>\n"
-"    <td valign=\"center\" align=\"right\">\n"
-"        <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\">\n"
-"    </td>\n"
-"</tr>\n"
-"<tr>\n"
-"    <td colspan=\"2\" style=\"text-align:center;\">\n"
-"        <hr width=\"100%\"\n"
-"            style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
-"        % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
-"        <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n"
-"            <strong>Communiqué interne</strong> : si vous y répondez, cela publiera une note interne. Les abonnés ne recevront aucune notification par e-mail.\n"
-"        </p>\n"
-"        % endif\n"
-"    </td>\n"
-"</tr>\n"
-"</tbody></table>\n"
-"</div>\n"
-"% endif\n"
-"<div>\n"
-"    ${object.body | safe}\n"
-"</div>\n"
-"% if ctx.get('tracking'):\n"
-"    <ul>\n"
-"    % for tracking in ctx['tracking']\n"
-"        <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
-"    % endfor\n"
-"    </ul>\n"
-"% endif\n"
-"\n"
-"% if ctx.get('signature'):\n"
-"    ${ctx['signature'] | safe}\n"
-"% endif\n"
-"<br/>\n"
-"<p style=\"color: #555555;\">\n"
-"    Envoyé par\n"
-"    % if ctx.get('website_url'):\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"
-"    à l'aide d'\n"
-"    <a target=\"_blank\" href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\">Odoo</a>.\n"
-"</p>\n"
-"</div>"
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:674
+#: code:addons/mail/models/mail_channel.py:680
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr "Ce salon est privé. Vous devez être invité pour le rejoindre."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_days
-msgid "# Days"
-msgstr "# Jours"
-
-#. 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) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-msgstr ""
-"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:63
+#: code:addons/mail/static/src/js/services/chat_manager.js:1634
 #, python-format
 msgid "%d Messages"
 msgstr "%d messages"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:31
+#: code:addons/mail/static/src/js/activity.js:88
 #, python-format
 msgid "%d days overdue"
 msgstr "%d jours en retard"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:248
+#: code:addons/mail/models/mail_template.py:279
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copie)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:236
+#: code:addons/mail/models/mail_thread.py:234
 #, python-format
 msgid "%s created"
 msgstr "%s créé(e)"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:81
+#: code:addons/mail/models/res_users.py:80
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s a rejoint le réseau %s."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:211
 #, python-format
 msgid "&nbsp;("
 msgstr "&nbsp;("
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:179
+#: code:addons/mail/static/src/xml/thread.xml:184
 #, python-format
 msgid "(from"
 msgstr "(de"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,help:mail.field_mail_shortcode__shortcode_type
 msgid ""
 "* Smiley are only used for HTML code to display an image * Text (default "
 "value) is used to substitute text with another text"
@@ -321,11 +129,11 @@ msgstr ""
 #: code:addons/mail/static/src/xml/activity.xml:49
 #, python-format
 msgid ", due on"
-msgstr ""
+msgstr ", exigible au"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:331
+#: code:addons/mail/static/src/xml/thread.xml:336
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr "-------- Montrer les anciens messages --------"
@@ -352,7 +160,7 @@ msgid "0 Today"
 msgstr "0 aujourd'hui"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:684
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -368,7 +176,16 @@ msgstr ""
 "            Pour insérer des réponses prédéfinies dans votre message, saisissez <b>:shortcut</b>.<br>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:584
+#: code:addons/mail/models/mail_channel.py:507
+#, python-format
+msgid ""
+"<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
+"href=\"#\" class=\"o_channel_redirect\" data-oe-"
+"id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:590
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -378,8 +195,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:508
-#: code:addons/mail/models/mail_channel.py:561
+#: code:addons/mail/models/mail_channel.py:514
+#: code:addons/mail/models/mail_channel.py:567
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -508,6 +325,11 @@ msgstr ""
 "<span class=\"o_stat_text\">Action contextuelle</span>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+msgid "<span class=\"oe_inline\">days</span>"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>\n"
@@ -530,6 +352,13 @@ msgid "<strong> Feedback</strong>"
 msgstr "<strong> Commentaire</strong>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid ""
+"<strong>Internal communication</strong>: Replying will post an internal "
+"note. Followers won't receive any email notification."
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>Only records checked in list view will be used.</strong><br/>\n"
@@ -544,9 +373,9 @@ msgid "<strong>Recommended Activities</strong>"
 msgstr "<strong>Activités recommandées</strong>"
 
 #. 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_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
 msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
@@ -569,115 +398,118 @@ msgid "Access Groups"
 msgstr "Groupes d'accès"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction
 msgid "Action Needed"
 msgstr "Nécessite une action"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__default
 msgid "Activated by default when subscribing."
 msgstr "Activé par défaut lors de l'abonnement."
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__active
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_search
 msgid "Active"
 msgstr "Actif"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__active_domain
 msgid "Active domain"
 msgstr "Domaine actif"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/systray.xml:87
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_ids
-#: model:ir.model.fields,field_description:mail.field_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.model.fields,field_description:mail.field_account_invoice__activity_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_ids
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
 #: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 #: model:mail.message.subtype,name:mail.mt_activities
@@ -689,7 +521,7 @@ msgstr "Activités"
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:60
 #: model:ir.model,name:mail.model_mail_activity
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_type_id
+#: 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
@@ -703,6 +535,32 @@ msgid "Activity Mixin"
 msgstr "Combinaison d'activités"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_state
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_state
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_state
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_state
+msgid "Activity State"
+msgstr "Status de l'Activité"
+
+#. 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"
@@ -724,7 +582,7 @@ msgstr "Type d'activité"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:87
+#: code:addons/mail/static/src/xml/discuss.xml:87
 #, python-format
 msgid "Add"
 msgstr "Ajouter"
@@ -732,7 +590,7 @@ msgstr "Ajouter"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:64
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_channel_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__channel_ids
 #, python-format
 msgid "Add Channels"
 msgstr "Ajouter des canaux"
@@ -740,7 +598,7 @@ msgstr "Ajouter des canaux"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:61
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_partner_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
 msgid "Add Followers"
@@ -755,22 +613,28 @@ msgstr ""
 "discussion"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,field_description:mail.field_mail_template_user_signature
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,field_description:mail.field_mail_template__user_signature
 msgid "Add Signature"
 msgstr "Ajouter une signature"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:41
-#: code:addons/mail/static/src/xml/client_action.xml:186
+#: code:addons/mail/static/src/xml/discuss.xml:41
+#: code:addons/mail/static/src/xml/discuss.xml:186
 #, python-format
 msgid "Add a channel"
 msgstr "Ajouter un canal"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:335
+#, python-format
+msgid "Add a new %(document)s or send an email to %(email_link)s"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:60
+#: code:addons/mail/static/src/xml/discuss.xml:60
 #, python-format
 msgid "Add a private channel"
 msgstr "Ajouter un canal privé"
@@ -787,7 +651,7 @@ msgid "Add contacts to notify..."
 msgstr "Ajouter des contacts à prévenir"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
 msgid "Additional Contacts"
 msgstr "Contacts supplémentaires"
 
@@ -802,45 +666,45 @@ msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
 #. 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_res_users_alias_id
+#: 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_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
 msgid "Alias"
 msgstr "Alias"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_contact
+#: 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
+#: model:ir.model.fields,field_description:mail.field_res_users__alias_contact
 msgid "Alias Contact Security"
 msgstr "Sécurité d'alias de contact"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__alias_domain
 msgid "Alias Domain"
 msgstr "Domaine alias"
 
 #. module: mail
-#: 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_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
 msgid "Alias Name"
 msgstr "Nom de l'alias"
 
 #. module: mail
-#: 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_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
 msgid "Alias domain"
 msgstr "Domaine d'alias"
 
 #. module: mail
-#: 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_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
 msgid "Aliased Model"
 msgstr "Modèle concerné"
 
@@ -865,16 +729,16 @@ msgstr "Toujours"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:198
+#: code:addons/mail/static/src/js/services/chat_manager.js:1328
 #, python-format
 msgid "Anonymous"
 msgstr "Anonyme"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__no_auto_thread
 msgid ""
 "Answers do not go in the original document discussion thread. This has an "
 "impact on the generated message-id."
@@ -883,8 +747,8 @@ msgstr ""
 "Ceci a un impact sur le message-id généré."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_id
 msgid "Applies to"
 msgstr "S'applique à"
 
@@ -896,9 +760,14 @@ msgid "Apply"
 msgstr "Appliquer"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+msgid "Archived"
+msgstr "Archivé"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:45
-#: model:ir.model.fields,field_description:mail.field_mail_activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
 #, python-format
 msgid "Assigned to"
 msgstr "Assigné à"
@@ -909,19 +778,19 @@ msgid "Attach a file"
 msgstr "Joindre un fichier"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_template__attachment_ids
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Attachments"
 msgstr "Pièces jointes"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_message_attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_message__attachment_ids
 msgid ""
 "Attachments are linked to a document through model / res_id and to the "
 "message through this field."
@@ -940,10 +809,10 @@ msgid "Authenticated Partners"
 msgstr "Partenaires authentifiés"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_id
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Author"
 msgstr "Auteur"
@@ -954,10 +823,10 @@ msgid "Author Signature (mass mail only)"
 msgstr "Signature de l'auteur (seulement publipostage)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,help:mail.field_mail_mail_author_id
-#: model:ir.model.fields,help:mail.field_mail_message_author_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,help:mail.field_mail_mail__author_id
+#: model:ir.model.fields,help:mail.field_mail_message__author_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_id
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that"
 " did not match any partner."
@@ -966,27 +835,27 @@ msgstr ""
 "adresse électronique ne correspondant à aucun partenaire."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_avatar
 msgid "Author's avatar"
 msgstr "Avatar de l'auteur"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_public_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_public_id
 msgid "Authorized Group"
 msgstr "Groupe autorisé"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_template__auto_delete
 msgid "Auto Delete"
 msgstr "Suppression automatique"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_ids
 msgid "Auto Subscription"
 msgstr "Abonnement automatique"
 
@@ -1008,16 +877,16 @@ msgid "Be careful with channels following internal notifications"
 msgstr "Soyez prudents avec les canaux de suivi de notifications internes"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
-#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
 msgid "Body"
 msgstr "Corps"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,field_description:mail.field_res_users_message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_users__message_bounce
 msgid "Bounce"
 msgstr "Rebond"
 
@@ -1063,35 +932,35 @@ msgid "Canned Response / Shortcode"
 msgstr "Réponse en conserve / Code court"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_cc
+#: model:ir.model.fields,help:mail.field_mail_mail__email_cc
 msgid "Carbon copy message recipients"
 msgstr "Destinataires en copie carbone (Cc)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,help:mail.field_mail_template_email_cc
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,help:mail.field_mail_template__email_cc
 msgid "Carbon copy recipients (placeholders may be used here)"
 msgstr ""
 "Destinataires en copie carbone (des variables peuvent être utilisées ici)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,help:mail.field_mail_activity_type_category
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,help:mail.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
 msgstr ""
 "Les catégories peuvent déclencher un comportement spécifique, tel que "
 "l'ouverture d'une vue calendrier"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__category
 msgid "Category"
 msgstr "Catégorie"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_cc
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_cc
 msgid "Cc"
 msgstr "Copie à (CC)"
 
@@ -1101,40 +970,40 @@ msgid "Change"
 msgstr "Change"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field
 msgid "Changed Field"
 msgstr "Champ modifié"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
 #: selection:mail.channel,channel_type:0
 msgid "Channel"
 msgstr "Canal"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_message_ids
 msgid "Channel Message"
 msgstr "Message du canal"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_type
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_type
 msgid "Channel Type"
 msgstr "Type de canal"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:36
-#: code:addons/mail/static/src/xml/client_action.xml:172
+#: code:addons/mail/static/src/xml/discuss.xml:36
+#: code:addons/mail/static/src/xml/discuss.xml:172
 #: code:addons/mail/static/src/xml/systray.xml:19
 #: code:addons/mail/static/src/xml/systray.xml:36
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__channel_ids
 #: model:ir.ui.menu,name:mail.mail_channel_menu_settings
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
 #, python-format
@@ -1149,7 +1018,7 @@ msgstr "Canal/partenaire"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:168
+#: code:addons/mail/static/src/xml/discuss.xml:168
 #: code:addons/mail/static/src/xml/systray.xml:18
 #: code:addons/mail/static/src/xml/systray.xml:32
 #: model:ir.actions.client,name:mail.mail_channel_action_client_chat
@@ -1168,10 +1037,10 @@ msgid "Chat Shortcode"
 msgstr "Code court de discussion"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__child_ids
 msgid "Child Messages"
 msgstr "Messages enfants"
 
@@ -1181,25 +1050,6 @@ msgid "Choose an example"
 msgstr "Choisir un exemple"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:342
-#, python-format
-msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
-msgstr ""
-"Cliquez ici pour ajouter un nouveau %(document)s ou envoyer un courriel à : "
-"%(email_link)s"
-
-#. module: mail
-#: code:addons/mail/models/mail_thread.py:358
-#, python-format
-msgid "Click here to add new %s"
-msgstr "Cliquez ici pour ajouter un nouveau %s"
-
-#. module: mail
-#: model:ir.actions.act_window,help:mail.mail_shortcode_action
-msgid "Click to define a new chat shortcode."
-msgstr "Cliquer pour définir un nouveau code court du chat"
-
-#. module: mail
 #: selection:mail.channel.partner,fold_state:0
 msgid "Closed"
 msgstr "Fermé"
@@ -1215,8 +1065,8 @@ msgid "Comma-separated ids of recipient partners"
 msgstr "Identifiants des partenaires destinataires, séparés par des virgules"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_partner_to
-#: model:ir.model.fields,help:mail.field_mail_template_partner_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr ""
@@ -1229,8 +1079,8 @@ msgid "Comma-separated recipient addresses"
 msgstr "Adresses des destinataires, séparées par des virgules"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,help:mail.field_mail_template_email_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,help:mail.field_mail_template__email_to
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr ""
 "Adresses des destinataires séparées par des virgules (des variables peuvent "
@@ -1251,8 +1101,8 @@ msgid "Compose Email"
 msgstr "Rédiger un courriel"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_composition_mode
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__composition_mode
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__composition_mode
 msgid "Composition mode"
 msgstr "Mode de composition"
 
@@ -1263,14 +1113,14 @@ msgstr "Configurez vos types d'activités"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:109
+#: code:addons/mail/static/src/xml/thread.xml:114
 #, python-format
 msgid "Congratulations, your inbox is empty"
 msgstr "Félicitations, votre boîte de réception est vide"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:647
+#: code:addons/mail/static/src/js/discuss.js:662
 #, python-format
 msgid "Congratulations, your inbox is empty!"
 msgstr "Félicitations, votre boîte de réception est vide."
@@ -1287,20 +1137,20 @@ msgid "Content"
 msgstr "Contenu"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_body
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body
-#: model:ir.model.fields,field_description:mail.field_mail_message_body
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_body
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__body
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body
+#: model:ir.model.fields,field_description:mail.field_mail_message__body
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__body
 msgid "Contents"
 msgstr "Contenus"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_fold_state
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__fold_state
 msgid "Conversation Fold State"
 msgstr "Conversation dans statut plié"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_minimized
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_minimized
 msgid "Conversation is minimized"
 msgstr "La conversation a été réduite au minimum"
 
@@ -1312,64 +1162,70 @@ msgid "Conversations"
 msgstr "Conversations"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,help:mail.field_res_users_message_bounce
+#: model:ir.model.fields,help:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,help:mail.field_res_users__message_bounce
 msgid "Counter of the number of bounced emails for this contact"
 msgstr "Le compteur du nombre de mails rejetés pour ce contact"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:307
+#: code:addons/mail/static/src/js/discuss.js:318
 #, python-format
 msgid "Create %s"
 msgstr "Créer : %s"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__create_date
 msgid "Create Date"
 msgstr "Date de création"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:350
+#, python-format
+msgid "Create a new %(document)s"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Created By"
 msgstr "Créé par"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_uid
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:41
-#: 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
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_date
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_date
 #, python-format
 msgid "Created on"
 msgstr "Créé le"
@@ -1380,90 +1236,22 @@ msgid "Creation Month"
 msgstr "Mois de création"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,help:mail.field_mail_mail_starred
-#: model:ir.model.fields,help:mail.field_mail_message_starred
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_starred
+#: model:ir.model.fields,help:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,help:mail.field_mail_mail__starred
+#: model:ir.model.fields,help:mail.field_mail_message__starred
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__starred
 msgid "Current user has a starred notification linked to this message"
 msgstr "L'utilisateur actuel a une notification \"favori\" associée à ce message"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_date
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__date
+#: model:ir.model.fields,field_description:mail.field_mail_message__date
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__date
 msgid "Date"
 msgstr "Date "
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,help:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,help:mail.field_event_event_message_last_post
-#: model:ir.model.fields,help:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,help:mail.field_event_track_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_track_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
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,help:mail.field_note_note_message_last_post
-#: model:ir.model.fields,help:mail.field_product_product_message_last_post
-#: model:ir.model.fields,help:mail.field_product_template_message_last_post
-#: model:ir.model.fields,help:mail.field_project_project_message_last_post
-#: model:ir.model.fields,help:mail.field_project_task_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,help:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,help:mail.field_res_users_message_last_post
-#: model:ir.model.fields,help:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,help:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr "Date du dernier message publié sur cet enregistrement"
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Deadline"
 msgstr "Echéance"
@@ -1474,32 +1262,32 @@ msgid "Dear"
 msgstr "Cher"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__default
 msgid "Default"
 msgstr "Par défaut"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,field_description:mail.field_mail_template_null_value
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,field_description:mail.field_mail_template__null_value
 msgid "Default Value"
 msgstr "Valeur par défaut"
 
 #. module: mail
-#: 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_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
 msgid "Default Values"
 msgstr "Valeurs par défaut"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__use_default_to
 msgid "Default recipients"
 msgstr "Destinataires par défaut"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,help:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,help:mail.field_mail_template__use_default_to
 msgid ""
 "Default recipients of the record:\n"
 "- partner (using id on a partner or the partner_id field) OR\n"
@@ -1511,26 +1299,31 @@ msgstr ""
 "- courriel (utilisant le champ email_from ou email)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.actions.act_window,help:mail.mail_shortcode_action
+msgid "Define a new chat shortcode"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete Emails"
 msgstr "Supprimer les courriels"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete_message
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete_message
 msgid "Delete Message Copy"
 msgstr "Supprimer la copie du message"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete sent emails (mass mailing only)"
 msgstr "Supprimer les courriels envoyés (seulement publipostage)"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:320
+#: code:addons/mail/static/src/xml/thread.xml:325
 #, python-format
 msgid "Delete this attachment"
 msgstr "Supprimer cette pièce jointe"
@@ -1541,15 +1334,15 @@ msgid "Delivery Failed"
 msgstr "Échec de l'envoi"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_description
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_description
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_description
+#: model:ir.model.fields,field_description:mail.field_mail_channel__description
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__description
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__description
 #: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
 msgid "Description"
 msgstr "Description"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_description
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__description
 msgid ""
 "Description that will be added in the message posted for this subtype. If "
 "void, the name will be added instead."
@@ -1559,7 +1352,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:46
+#: code:addons/mail/static/src/xml/discuss.xml:46
 #, python-format
 msgid "Direct Messages"
 msgstr "Messages directs"
@@ -1590,26 +1383,26 @@ msgid "Discussions"
 msgstr "Discussions"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_display_name
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__display_name
+#: 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_subtype__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_notification__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_thread__display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
@@ -1623,13 +1416,13 @@ msgstr ""
 "composition avec ce modèle"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_res_name
+#: model:ir.model.fields,help:mail.field_mail_activity__res_name
 msgid "Display name of the related document."
 msgstr "Afficher le nom du document connexe."
 
 #. 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
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete_message
 msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
@@ -1643,7 +1436,12 @@ msgid "Document Followers"
 msgstr "Abonnés au document"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_name
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_model_id
+msgid "Document Model"
+msgstr "Modèle de document"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_name
 msgid "Document Name"
 msgstr "Nom du document"
 
@@ -1664,28 +1462,28 @@ msgstr "Terminé et planifier le prochain"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:296
+#: code:addons/mail/static/src/xml/thread.xml:301
 #, python-format
 msgid "Download this PDF"
 msgstr "Télécharger ce PDF"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:272
-#: code:addons/mail/static/src/xml/thread.xml:285
-#: code:addons/mail/static/src/xml/thread.xml:308
+#: code:addons/mail/static/src/xml/thread.xml:277
+#: code:addons/mail/static/src/xml/thread.xml:290
+#: code:addons/mail/static/src/xml/thread.xml:313
 #, python-format
 msgid "Download this attachment"
 msgstr "Télécharger cette pièce jointe"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity__date_deadline
 msgid "Due Date"
 msgstr "Date d'échéance"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:37
+#: code:addons/mail/static/src/js/activity.js:94
 #, python-format
 msgid "Due in %d days"
 msgstr "Dû dans %d jours"
@@ -1717,7 +1515,7 @@ msgid "Edit subscription"
 msgstr "Modifier abonnement"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_email
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_email
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 #: model:mail.activity.type,name:mail.mail_activity_data_email
 #: selection:mail.compose.message,message_type:0
@@ -1752,12 +1550,12 @@ msgid "Email Search"
 msgstr "Recherche des emails"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_email_status
+#: model:ir.model.fields,field_description:mail.field_mail_notification__email_status
 msgid "Email Status"
 msgstr "État du courriel"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__template_id
 msgid "Email Template"
 msgstr "Modèle de courriel"
 
@@ -1777,7 +1575,7 @@ msgid "Email Thread"
 msgstr "Discussion par courriel"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_alias_id
+#: model:ir.model.fields,help:mail.field_res_users__alias_id
 msgid ""
 "Email address internally associated with this user. Incoming emails will "
 "appear in the user's notifications."
@@ -1786,10 +1584,10 @@ msgstr ""
 "apparaîtront dans les notifications de l'utilisateur."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_email_from
-#: model:ir.model.fields,help:mail.field_mail_mail_email_from
-#: model:ir.model.fields,help:mail.field_mail_message_email_from
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,help:mail.field_mail_compose_message__email_from
+#: model:ir.model.fields,help:mail.field_mail_mail__email_from
+#: model:ir.model.fields,help:mail.field_mail_message__email_from
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__email_from
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found and replaces the author_id field in the chatter."
@@ -1828,7 +1626,7 @@ msgstr ""
 "Erreur durant la communication avec le serveur de garantie de l'éditeur."
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:302
+#: code:addons/mail/models/mail_mail.py:300
 #, python-format
 msgid ""
 "Error without exception. Probably due do sending an email without computed "
@@ -1873,7 +1671,7 @@ msgid "Extended Filters..."
 msgstr "Filtres étendus..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_fail_counter
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__fail_counter
 msgid "Fail Mail"
 msgstr "Mail échoué"
 
@@ -1883,19 +1681,19 @@ msgid "Failed"
 msgstr "Échec"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:374
+#: code:addons/mail/models/mail_template.py:368
 #, python-format
 msgid "Failed to render template %r using values %r"
 msgstr "Echec de rendu du modèle %r utilisant les valeurs %r"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,field_description:mail.field_mail_mail__failure_reason
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Failure Reason"
 msgstr "Raison de l'échec"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
 msgid ""
 "Failure reason. This is usually the exception thrown by the email server, "
 "stored to ease the debugging of mailing issues."
@@ -1904,45 +1702,45 @@ msgstr ""
 "messagerie, stockée pour faciliter le débogage des mails d'incidents."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred_partner_ids
 msgid "Favorited By"
 msgstr "Préféré par"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:215
-#: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
+#: code:addons/mail/static/src/js/activity.js:245
+#: model:ir.model.fields,field_description:mail.field_mail_activity__feedback
 #, python-format
 msgid "Feedback"
 msgstr "Discussion"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_object_field
 msgid "Field"
 msgstr "Champ"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:24
+#: code:addons/mail/models/ir_model.py:30
 #, python-format
 msgid "Field \"Mail Thread\" cannot be changed to \"False\"."
 msgstr "Le champ \"Mail Thread\" ne peut être remis à \"Faux\""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_desc
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_desc
 msgid "Field Description"
 msgstr "Description du champ"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_type
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_type
 msgid "Field Type"
 msgstr "Type de Champ"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__relation_field
 msgid ""
 "Field used to link the related model to the subtype model when using "
 "automatic subscription on a related document. The field is used to compute "
@@ -1958,8 +1756,8 @@ msgid "Fields"
 msgstr "Champs"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,help:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,help:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,help:mail.field_mail_template__copyvalue
 msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
@@ -1974,7 +1772,6 @@ msgstr "Replié"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:696
 #: code:addons/mail/static/src/xml/followers.xml:20
 #, python-format
 msgid "Follow"
@@ -1982,208 +1779,211 @@ msgstr "Suivre"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_followers
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_follower_ids
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: model:ir.ui.view,arch_db:mail.view_followers_tree
 msgid "Followers"
 msgstr "Abonnés"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_channel_ids
 msgid "Followers (Channels)"
 msgstr "Abonnés (Canaux)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_partner_ids
 msgid "Followers (Partners)"
 msgstr "Abonnés (Partenaires)"
 
@@ -2212,18 +2012,18 @@ msgid "Following"
 msgstr "Abonné(e)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_icon
-#: model:ir.model.fields,help:mail.field_mail_activity_type_icon
+#: 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 "Icône Font Awesome e.g. fa-tasks"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_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
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_from
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_from
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__email_from
 msgid "From"
 msgstr "De"
 
@@ -2246,7 +2046,7 @@ msgid "Gateway"
 msgstr "Passerelle"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:55
+#: code:addons/mail/models/res_users.py:54
 #, python-format
 msgid "Go to the configuration panel"
 msgstr "Aller sur le panneau de configuration"
@@ -2289,49 +2089,54 @@ msgid "Has attachments"
 msgstr "Comporte des pièces jointes"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_headers
+#: model:ir.model.fields,field_description:mail.field_mail_mail__headers
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Headers"
 msgstr "En-têtes"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_hidden
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Hello"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
 msgid "Hidden"
 msgstr "Masqué"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_hidden
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__hidden
 msgid "Hide the subtype in the follower options"
 msgstr "Cacher le sous-type dans les options de followers"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_id
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__id
+#: 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_subtype__id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__id
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__id
+#: model:ir.model.fields,field_description:mail.field_mail_template__id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__id
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mail
-#: 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_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
 msgid ""
 "ID of the parent record holding the alias (example: project holding the task"
 " creation alias)"
@@ -2340,163 +2145,165 @@ msgstr ""
 "projet qui contient l'alias lié à la tâche)"
 
 #. 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
+#: 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 "Icône"
 
 #. 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
+#: 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"
 msgstr "Id. de la ressource suivie"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:119
-#: code:addons/mail/static/src/xml/client_action.xml:203
+#: code:addons/mail/static/src/xml/discuss.xml:119
+#: code:addons/mail/static/src/xml/discuss.xml:203
 #, python-format
 msgid "Idle"
 msgstr "Inactif"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,help:mail.field_event_event_message_unread
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread
-#: model:ir.model.fields,help:mail.field_event_track_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,help:mail.field_note_note_message_unread
-#: model:ir.model.fields,help:mail.field_product_product_message_unread
-#: model:ir.model.fields,help:mail.field_product_template_message_unread
-#: model:ir.model.fields,help:mail.field_project_project_message_unread
-#: model:ir.model.fields,help:mail.field_project_task_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread
-#: model:ir.model.fields,help:mail.field_res_users_message_unread
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,help:mail.field_event_event__message_unread
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread
+#: model:ir.model.fields,help:mail.field_event_track__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,help:mail.field_note_note__message_unread
+#: model:ir.model.fields,help:mail.field_product_product__message_unread
+#: model:ir.model.fields,help:mail.field_product_template__message_unread
+#: model:ir.model.fields,help:mail.field_project_project__message_unread
+#: model:ir.model.fields,help:mail.field_project_task__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread
+#: model:ir.model.fields,help:mail.field_res_users__message_unread
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread
 msgid "If checked new messages require your attention."
 msgstr "Si coché, de nouveaux messages demandent votre attention."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,help:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction
 msgid "If checked, new messages require your attention."
 msgstr "Si coché, de nouveaux messages demandent votre attention."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
 msgid ""
 "If checked, the partners will receive an email warning they have been added "
 "in the document's followers."
@@ -2505,8 +2312,8 @@ msgstr ""
 "été abonnés au document."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,help:mail.field_mail_template_user_signature
+#: model:ir.model.fields,help:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,help:mail.field_mail_template__user_signature
 msgid ""
 "If checked, the user's signature will be appended to the text version of the"
 " message"
@@ -2515,8 +2322,8 @@ msgstr ""
 "message"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_opt_out
-#: model:ir.model.fields,help:mail.field_res_users_opt_out
+#: model:ir.model.fields,help:mail.field_res_partner__opt_out
+#: model:ir.model.fields,help:mail.field_res_users__opt_out
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails for mass "
 "mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
@@ -2528,7 +2335,7 @@ msgstr ""
 "filtrer les partenaires lors de l'exécution de l'envoi de masse"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_mail__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible."
@@ -2538,8 +2345,8 @@ msgstr ""
 "envoyée dès que possible."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_scheduled_date
-#: model:ir.model.fields,help:mail.field_mail_template_scheduled_date
+#: model:ir.model.fields,help:mail.field_email_template_preview__scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_template__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible. Jinja2 placeholders may be used."
@@ -2550,7 +2357,7 @@ msgstr ""
 "utilisés."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
 msgid ""
 "If you have setup a catch-all email domain redirected to the Odoo server, "
 "enter the domain name here."
@@ -2559,26 +2366,26 @@ msgstr ""
 "serveur d'Odoo, entrez le nom du domaine ici."
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:141
+#: code:addons/mail/models/mail_alias.py:130
 #, python-format
 msgid "Inactive Alias"
 msgstr "Alias inactif"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:655
-#: code:addons/mail/static/src/xml/client_action.xml:22
-#: code:addons/mail/static/src/xml/client_action.xml:154
-#: code:addons/mail/static/src/xml/client_action.xml:164
+#: code:addons/mail/static/src/js/services/chat_manager.js:84
+#: code:addons/mail/static/src/xml/discuss.xml:22
+#: code:addons/mail/static/src/xml/discuss.xml:154
+#: code:addons/mail/static/src/xml/discuss.xml:164
 #, python-format
 msgid "Inbox"
 msgstr "Boîte de réception"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,help:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,help:mail.field_mail_message_parent_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,help:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,help:mail.field_mail_message__parent_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__parent_id
 msgid "Initial thread message."
 msgstr "Message initial du fil."
 
@@ -2589,12 +2396,12 @@ msgid "Integrations"
 msgstr "Intégrations"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__internal
 msgid "Internal Only"
 msgstr "Interne Seulement"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:99
+#: code:addons/mail/models/mail_alias.py:88
 #, python-format
 msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
@@ -2604,7 +2411,8 @@ msgstr ""
 "attendue, par exemple \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1794
+#: code:addons/mail/models/mail_thread.py:1811
+#: code:addons/mail/models/mail_thread.py:1996
 #, python-format
 msgid ""
 "Invalid record set: should be called as model (without records) or on "
@@ -2614,14 +2422,14 @@ msgstr ""
 "(sans enregistrements) ou sur une seule fiche d'enregistrement"
 
 #. module: mail
-#: code:addons/mail/controllers/main.py:41
+#: code:addons/mail/controllers/main.py:40
 #, python-format
 msgid "Invalid token in route %s"
 msgstr "Jeton invalide dans la route %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "Invitation"
 msgstr "Invitation"
@@ -2634,8 +2442,8 @@ msgstr "Invitation à suivre %s : %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:44
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:44
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite"
 msgstr "Inviter"
@@ -2649,15 +2457,15 @@ msgstr "Invités des abonnés"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:31
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:29
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite people"
 msgstr "Invite des gens"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:867
+#: code:addons/mail/static/src/js/discuss.js:882
 #, python-format
 msgid "Invite people to #%s"
 msgstr "Inviter des joueurs à"
@@ -2673,95 +2481,96 @@ msgid "Invited people only"
 msgstr "Seulement les personnes invitées"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_note_note_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_product_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_template_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_project_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_task_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_users_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_note_note__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_product__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_template__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_project__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_task__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_users__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_is_follower
 msgid "Is Follower"
 msgstr "Est un abonné"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification
+#: model:ir.model.fields,field_description:mail.field_mail_mail__notification
 msgid "Is Notification"
 msgstr "Est une notification"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_read
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_read
 msgid "Is Read"
 msgstr "Est lu"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_subscribed
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_subscribed
 msgid "Is Subscribed"
 msgstr "Est abonné"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_member
 msgid "Is a member"
 msgstr "Est un membre"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
 msgid "Is pinned on the interface"
 msgstr "Est épinglé sur l'interface"
 
@@ -2776,144 +2585,76 @@ msgid "Join a group"
 msgstr "Rejoindre un groupe"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_lang
-#: model:ir.model.fields,field_description:mail.field_mail_template_lang
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__lang
+#: model:ir.model.fields,field_description:mail.field_mail_template__lang
 msgid "Language"
 msgstr "Langue"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_track_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_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_test_simple_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_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
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,field_description:mail.field_note_note_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_product_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_template_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_project_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_task_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_users_message_last_post
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_last_post
-msgid "Last Message Date"
-msgstr "Date du dernier message"
-
-#. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner___last_update
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message___last_update
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract___last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message____last_update
+#: 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_subtype____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_notification____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_template____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_thread____last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract____last_update
 msgid "Last Modified on"
 msgstr "Dernière Modification le"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_last_seen_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_seen_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_last_seen_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__seen_message_id
 msgid "Last Seen"
 msgstr "Dernier vu"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_uid
-#: 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_tracking_value_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_date
-#: 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_tracking_value_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
@@ -2937,14 +2678,14 @@ msgstr "Congé"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:687
-#: code:addons/mail/static/src/xml/client_action.xml:112
+#: code:addons/mail/models/mail_channel.py:693
+#: code:addons/mail/static/src/xml/discuss.xml:112
 #, python-format
 msgid "Leave this channel"
 msgstr "Quitter ce canal"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_channel_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__channel_ids
 msgid ""
 "List of channels that will be added as listeners of the current document."
 msgstr ""
@@ -2952,7 +2693,7 @@ msgstr ""
 "actuel."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__partner_ids
 msgid ""
 "List of partners that will be added as follower of the current document."
 msgstr ""
@@ -2960,25 +2701,25 @@ msgstr ""
 "actuel."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:698
+#: code:addons/mail/models/mail_channel.py:704
 #, python-format
 msgid "List users in the current channel"
 msgstr "Répertorier les utilisateur dans le canal actuel"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__channel_id
 msgid "Listener"
 msgstr "Ecouteur"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_partner_ids
 msgid "Listeners"
 msgstr "Ecouteurs"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_channel_partner
 msgid "Listeners of a Channel"
-msgstr ""
+msgstr "Audience d'un canal"
 
 #. module: mail
 #: selection:mail.channel,channel_type:0
@@ -2987,7 +2728,7 @@ msgstr "Conversation instantanée"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:31
+#: code:addons/mail/static/src/js/chatter_composer.js:30
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Log"
@@ -3011,8 +2752,8 @@ msgid "Log an Activity"
 msgstr "Planifier une Activité"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__is_log
 msgid "Log an Internal Note"
 msgstr "Enregistrer une note interne"
 
@@ -3031,10 +2772,10 @@ msgid "Log or schedule an activity"
 msgstr "Enregistrer ou planifier une activité"
 
 #. 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
+#: 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 "Envoyer le type d'activité par e-mail"
 
@@ -3044,13 +2785,13 @@ msgid "Mail Channel Form"
 msgstr "Formulaire de courrier pour la chaine"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:369
+#: code:addons/mail/models/mail_mail.py:367
 #, python-format
 msgid "Mail Delivery Failed"
 msgstr "Échec d'envoi du courriel"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,field_description:mail.field_ir_model__is_mail_thread
 #: model:ir.ui.view,arch_db:mail.model_search_view
 msgid "Mail Thread"
 msgstr "Fil de discussion"
@@ -3061,7 +2802,7 @@ msgid "Mail Tracking Value"
 msgstr "Valeur de suivi des courriers"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_notification
+#: model:ir.model.fields,help:mail.field_mail_mail__notification
 msgid "Mail has been created to notify people of an existing mail.message"
 msgstr ""
 "Un courrier a été créé pour prévenir les personnes d'un mail.message "
@@ -3075,7 +2816,7 @@ msgid "Mail: Email Queue Manager"
 msgstr "E-mail : gestionnaire de file d'attente d'e-mails"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:832
+#: code:addons/mail/models/mail_thread.py:813
 #, python-format
 msgid "Mailbox unavailable - %s"
 msgstr "Boîte de réception non disponible – %s"
@@ -3094,14 +2835,14 @@ msgstr "Marquer comme terminé"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all as read"
 msgstr "Tout marquer comme lu"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all read"
 msgstr "Tout marquer comme lu"
@@ -3113,15 +2854,15 @@ msgstr "Marqué comme fait"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:206
+#: code:addons/mail/static/src/xml/thread.xml:211
 #, python-format
 msgid "Mark as Read"
 msgstr "Marquer comme lu"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:153
-#: code:addons/mail/static/src/xml/thread.xml:200
+#: code:addons/mail/static/src/xml/thread.xml:158
+#: code:addons/mail/static/src/xml/thread.xml:205
 #, python-format
 msgid "Mark as Todo"
 msgstr "Marquer \"À faire\""
@@ -3134,12 +2875,12 @@ msgid "Mark as done"
 msgstr "Marquer comme fait"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_medium
 msgid "Medium-sized photo"
 msgstr "Photo (taille moyenne)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,help:mail.field_mail_channel__image_medium
 msgid ""
 "Medium-sized photo of the group. It is automatically resized as a 128x128px "
 "image, with aspect ratio preserved. Use this field in form views or some "
@@ -3161,7 +2902,7 @@ msgid "Members"
 msgstr "Membres"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,help:mail.field_mail_channel__group_ids
 msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
@@ -3170,16 +2911,22 @@ msgstr ""
 "cependant gérer leur abonnement manuellement si nécessaire."
 
 #. module: mail
+#: code:addons/mail/wizard/base_partner_merge.py:13
+#, python-format
+msgid "Merged with the following partners:"
+msgstr "Fusionnés avec les partenaires suivants"
+
+#. 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.model.fields,field_description:mail.field_mail_mail__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Message"
 msgstr "Message"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
 msgid "Message ID"
 msgstr "Message ID"
 
@@ -3189,38 +2936,38 @@ msgid "Message Notifications"
 msgstr "Notifications par message"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_mail__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_message__record_name
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__record_name
 msgid "Message Record Name"
 msgstr "Nom de l'enregistrement du message"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__name
 msgid "Message Type"
 msgstr "Type de message"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_to
+#: model:ir.model.fields,help:mail.field_mail_mail__email_to
 msgid "Message recipients (emails)"
 msgstr "Destinataires du message (emails)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_references
+#: model:ir.model.fields,help:mail.field_mail_mail__references
 msgid "Message references, such as identifiers of previous messages"
 msgstr ""
 "Références du message , tel que les identifiants des messages précédents"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
+#: code:addons/mail/static/src/xml/discuss.xml:124
 #, python-format
 msgid "Message sent in \""
 msgstr "Message envoyé dans \""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__name
 msgid ""
 "Message subtype gives a more precise type on the message, especially for "
 "system notifications. For example, it can be a notification related to a new"
@@ -3241,7 +2988,7 @@ msgid "Message subtypes"
 msgstr "Sous-types de messages"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_followers_subtype_ids
+#: model:ir.model.fields,help:mail.field_mail_followers__subtype_ids
 msgid ""
 "Message subtypes followed, meaning subtypes that will be pushed onto the "
 "user's Wall."
@@ -3250,10 +2997,10 @@ msgstr ""
 " le Mur de l'utilisateur."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,help:mail.field_mail_mail_message_type
-#: model:ir.model.fields,help:mail.field_mail_message_message_type
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,help:mail.field_mail_mail__message_type
+#: model:ir.model.fields,help:mail.field_mail_message__message_type
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_type
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
@@ -3263,87 +3010,88 @@ msgstr ""
 "autres messages tels que les réponses des utilisateurs"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,help:mail.field_mail_mail_message_id
-#: model:ir.model.fields,help:mail.field_mail_message_message_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,help:mail.field_mail_mail__message_id
+#: model:ir.model.fields,help:mail.field_mail_message__message_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_id
 msgid "Message unique identifier"
 msgstr "Identifiant unique de message"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_id
 msgid "Message-Id"
 msgstr "ID du message"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_ids
 #: model:ir.ui.menu,name:mail.menu_mail_message
 #: model:ir.ui.view,arch_db:mail.view_message_tree
 msgid "Messages"
@@ -3364,7 +3112,7 @@ msgstr ""
 "les traiter plus tard. "
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__internal
 msgid ""
 "Messages with internal subtypes will be visible only by employees, aka "
 "members of base_user group"
@@ -3373,20 +3121,20 @@ msgstr ""
 "employés, aussi appelé membre du groupe base_user"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_res_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_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
 msgid "Model"
 msgstr "Modèle"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_res_model
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__res_model
 msgid "Model of the followed resource"
 msgstr "Modèle de la ressource suivie"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__res_model
 msgid ""
 "Model the subtype applies to. If False, this subtype applies to all models."
 msgstr ""
@@ -3415,25 +3163,25 @@ msgid "My Activities"
 msgstr "Mes activités"
 
 #. 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_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.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Name"
 msgstr "Nom"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_record_name
-#: model:ir.model.fields,help:mail.field_mail_mail_record_name
-#: model:ir.model.fields,help:mail.field_mail_message_record_name
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,help:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,help:mail.field_mail_mail__record_name
+#: model:ir.model.fields,help:mail.field_mail_message__record_name
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__record_name
 msgid "Name get of the related document."
 msgstr "Nom obtenu pour le document relié."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,help:mail.field_mail_template_report_name
+#: model:ir.model.fields,help:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,help:mail.field_mail_template__report_name
 msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
@@ -3442,71 +3190,71 @@ msgstr ""
 "L'extension peut être omise: celle du rapport sera utilisée."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_mail_needaction
-#: model:ir.model.fields,help:mail.field_mail_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_mail__needaction
+#: model:ir.model.fields,help:mail.field_mail_message__needaction
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__needaction
 #: model:ir.ui.view,arch_db:mail.view_message_search
 msgid "Need Action"
 msgstr "Nécessite une action"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_res_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
 msgid "Needaction Recipient"
 msgstr "Destinataire de messages d'action en demande"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:138
+#: code:addons/mail/static/src/xml/discuss.xml:138
 #, python-format
 msgid "New Channel"
 msgstr "Nouveau canal"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:137
+#: code:addons/mail/static/src/xml/discuss.xml:137
 #, python-format
 msgid "New Message"
 msgstr "Nouveau message"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_char
 msgid "New Value Char"
 msgstr "Nouvelle valeur texte"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_datetime
 msgid "New Value Datetime"
 msgstr "Nouvelle valeur de date et heure"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_float
 msgid "New Value Float"
 msgstr "Nouvelle valeur décimale"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_integer
 msgid "New Value Integer"
 msgstr "Nouvelle valeur entier"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_monetary
 msgid "New Value Monetary"
 msgstr "Nouvelle valeur monétaire"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_text
 msgid "New Value Text"
 msgstr "Nouvelle valeur de texte"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:55
-#: code:addons/mail/static/src/js/window_manager.js:139
+#: code:addons/mail/static/src/js/services/chat_manager.js:1625
+#: code:addons/mail/static/src/js/services/chat_window_manager.js:283
 #: code:addons/mail/static/src/xml/systray.xml:12
 #: code:addons/mail/static/src/xml/systray.xml:21
 #, python-format
@@ -3515,21 +3263,21 @@ msgstr "Nouveau Message"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:233
+#: code:addons/mail/static/src/xml/thread.xml:238
 #, python-format
 msgid "New messages"
 msgstr "Nouveaux messages"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:110
+#: code:addons/mail/static/src/xml/thread.xml:115
 #, python-format
 msgid "New messages appear here."
 msgstr "Les nouveaux messages s'afficheront ici."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:97
+#: code:addons/mail/static/src/js/discuss.js:99
 #, python-format
 msgid "New people"
 msgstr "Nouvelles personnes"
@@ -3540,85 +3288,85 @@ msgid "Next Activities"
 msgstr "Activités suivantes"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_date_deadline
 msgid "Next Activity Deadline"
 msgstr "Date limite de l'Activité à Venir"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_summary
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_summary
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_summary
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_summary
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_summary
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_summary
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_summary
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_summary
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_summary
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_summary
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_summary
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_summary
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_summary
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_summary
 msgid "Next Activity Summary"
 msgstr "Résumé d'activité suivant"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_type_id
 msgid "Next Activity Type"
 msgstr "Type d'Activités à Venir"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,field_description:mail.field_mail_activity__has_recommended_activities
 msgid "Next activities available"
 msgstr "Activités suivantes disponibles"
 
@@ -3662,28 +3410,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:113
+#: code:addons/mail/static/src/xml/thread.xml:118
 #, python-format
 msgid "No starred message"
 msgstr "Pas de messages mis en favoris"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__no_auto_thread
 msgid "No threading for answers"
 msgstr "Pas de suivi dans le fil pour les réponses"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_note
+#: model:ir.model.fields,field_description:mail.field_mail_activity__note
 #: model:mail.message.subtype,name:mail.mt_note
 msgid "Note"
 msgstr "Note"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:157
+#: code:addons/mail/static/src/xml/thread.xml:162
 #, python-format
 msgid "Note by"
 msgstr "Note écrite par"
@@ -3694,100 +3442,101 @@ msgid "Notification"
 msgstr "Notification"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_users_notification_type
+#: model:ir.model.fields,field_description:mail.field_res_users__notification_type
 msgid "Notification Management"
 msgstr "Gestion des notifications"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_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 "Notifications"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers"
 msgstr "Avertir les abonnés"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_notify
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_notify
+#: model:ir.model.fields,help:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers of the document (mass post only)"
 msgstr "Avertir les abonnés de ce document (publipostage uniquement)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of Actions"
 msgstr "Nombre d'actions"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_days
+#: 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."
@@ -3796,149 +3545,153 @@ msgstr ""
 "l'échéance de l'action."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_payment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of messages which requires an action"
 msgstr "Nombre de messages exigeant une action"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread_counter
 msgid "Number of unread messages"
 msgstr "Nombre de messages non lus"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model:ir.ui.view,arch_db:mail.message_notification_email
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Odoo"
 msgstr "Odoo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:895
+#: code:addons/mail/static/src/js/discuss.js:910
 #, python-format
 msgid ""
 "Odoo has now the permission to send you native notifications on this device."
@@ -3948,14 +3701,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "Odoo needs your permission to"
 msgstr "Odoo a besoin de votre autorisation pour"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:892
+#: code:addons/mail/static/src/js/discuss.js:907
 #, python-format
 msgid ""
 "Odoo will not have the permission to send native notifications on this "
@@ -3966,38 +3719,38 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:120
+#: code:addons/mail/static/src/xml/discuss.xml:120
 #, python-format
 msgid "Offline"
 msgstr "Hors ligne"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_char
 msgid "Old Value Char"
 msgstr "Ancienne valeur texte"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_datetime
 msgid "Old Value DateTime"
 msgstr "Ancienne valeur de date et heure"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_float
 msgid "Old Value Float"
 msgstr "Ancienne valeur décimale"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_integer
 msgid "Old Value Integer"
 msgstr "Ancienne valeur entier"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_monetary
 msgid "Old Value Monetary"
 msgstr "Ancienne valeur monétaire"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_text
 msgid "Old Value Text"
 msgstr "Ancienne valeur de texte"
 
@@ -4026,14 +3779,14 @@ msgstr "Un abonné"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:118
-#: code:addons/mail/static/src/xml/client_action.xml:202
+#: code:addons/mail/static/src/xml/discuss.xml:118
+#: code:addons/mail/static/src/xml/discuss.xml:202
 #, python-format
 msgid "Online"
 msgstr "En ligne"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:22
+#: code:addons/mail/models/ir_model.py:28
 #, python-format
 msgid "Only custom models can be modified."
 msgstr "Seul les modèles personnalisés peuvent être modifiés."
@@ -4055,14 +3808,14 @@ msgstr "Ouvrir le document père"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Open channel settings"
 msgstr "Ouvrir les paramètres du canal"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:187
+#: code:addons/mail/static/src/xml/discuss.xml:187
 #, python-format
 msgid "Open chat"
 msgstr "Ouvrir le chat"
@@ -4075,15 +3828,15 @@ msgid "Open in Discuss"
 msgstr "Ouvrir dans Discuter"
 
 #. 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
+#: 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"
 msgstr "Option de retrait"
 
 #. module: mail
-#: 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_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
 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 "
@@ -4094,8 +3847,8 @@ msgstr ""
 " la création de nouveaux enregistrements sera complètement désactivée."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,help:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,help:mail.field_mail_template__mail_server_id
 msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
@@ -4104,14 +3857,14 @@ msgstr ""
 "la plus haute priorité sera utilisée."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_template
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_template
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_template
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_template
 msgid "Optional report to print and attach"
 msgstr "Rapport facultatif à imprimer et à joindre"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_lang
-#: model:ir.model.fields,help:mail.field_mail_template_lang
+#: model:ir.model.fields,help:mail.field_email_template_preview__lang
+#: model:ir.model.fields,help:mail.field_mail_template__lang
 msgid ""
 "Optional translation language (ISO code) to select when sending out an "
 "email. If not set, the english version will be used. This should usually be "
@@ -4124,8 +3877,8 @@ msgstr ""
 " approprié, comme : ${object.partner_id.lang}."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,help:mail.field_mail_template_null_value
+#: model:ir.model.fields,help:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,help:mail.field_mail_template__null_value
 msgid "Optional value to use if the target field is empty"
 msgstr "Valeur facultative à utiliser si le champ cible est vide"
 
@@ -4140,8 +3893,8 @@ msgid "Outgoing"
 msgstr "Sortants"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__mail_server_id
 msgid "Outgoing Mail Server"
 msgstr "Serveur de courriel sortant"
 
@@ -4151,10 +3904,10 @@ msgid "Outgoing Mails"
 msgstr "Courriels à envoyer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_server_id
 msgid "Outgoing mail server"
 msgstr "Serveur courriel sortant"
 
@@ -4168,12 +3921,12 @@ msgstr "Serveur courriel sortant"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4187,43 +3940,43 @@ msgid "Override author's email"
 msgstr "Surcharger l'adresse de l'expéditeur"
 
 #. module: mail
-#: 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_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
 msgid "Owner"
 msgstr "Propriétaire"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__parent_id
 msgid "Parent"
 msgstr "Parent"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__parent_id
 msgid "Parent Message"
 msgstr "Message parent"
 
 #. module: mail
-#: 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_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
 msgid "Parent Model"
 msgstr "Modèle parent"
 
 #. module: mail
-#: 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_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
 msgid "Parent Record Thread ID"
 msgstr "Identifiant de la discussion de l'enregistrement parent"
 
 #. module: mail
-#: 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_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
 msgid ""
 "Parent model holding the alias. The model holding the alias reference is not"
 " necessarily the model given by alias_model_id (example: project "
@@ -4234,7 +3987,7 @@ msgstr ""
 "(parent_model) et task (modèle))"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__parent_id
 msgid ""
 "Parent subtype, used for automatic subscription. This field is not correctly"
 " named. For example on a project, the parent_id of project subtypes refers "
@@ -4262,42 +4015,42 @@ msgstr ""
 "Partenaires qui n'ont pas demandé à être exclus des campagnes de prospection"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction_partner_ids
 msgid "Partners with Need Action"
 msgstr "Partenaire nécessitant une action."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_template__auto_delete
 msgid "Permanently delete this email after sending it, to save space"
 msgstr "Suppression de ce courriel après envoi pour économiser de l'espace"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:891
+#: code:addons/mail/static/src/js/discuss.js:906
 #, python-format
 msgid "Permission denied"
 msgstr "Permission refusée"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:894
+#: code:addons/mail/static/src/js/discuss.js:909
 #, python-format
 msgid "Permission granted"
 msgstr "Permission accordée"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image
 msgid "Photo"
 msgstr "Photo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,field_description:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,field_description:mail.field_mail_template__copyvalue
 msgid "Placeholder Expression"
 msgstr "Expression fictive"
 
@@ -4311,12 +4064,12 @@ msgstr "Expression fictive"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4332,49 +4085,56 @@ msgid "Planned activities"
 msgstr "Activités planifiées"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__days
+msgid "Planned in"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:282
+#: code:addons/mail/static/src/xml/thread.xml:287
 #, python-format
 msgid "Play this video"
 msgstr "Lire cette vidéo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:158
+#: code:addons/mail/static/src/js/chatter_composer.js:157
 #, python-format
 msgid "Please complete customer's informations"
 msgstr "Indiquez les informations du client"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:84
+#: code:addons/mail/static/src/js/many2many_tags_email.js:96
 #, python-format
 msgid "Please complete customer's informations and email"
 msgstr "Indiquez les informations du client et son adresse e-mail"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Please contact us instead using"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Please, wait while the file is uploading."
 msgstr "Merci de patienter durant le transfert du fichier."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_notification_type
+#: model:ir.model.fields,help:mail.field_res_users__notification_type
 msgid ""
 "Policy on how to handle Chatter notifications:\n"
-"- Emails: notifications are sent to your email\n"
-"- Odoo: notifications appear in your Odoo Inbox"
+"- Handle by Emails: notifications are sent to your email address\n"
+"- Handle in Odoo: notifications appear in your Odoo Inbox"
 msgstr ""
-"Politique de gestion des notifications Chatter :\n"
-"- E-mails : les notifications sont envoyées à votre adresse électronique\n"
-"- Odoo : les notifications s'affichent dans votre boîte de réception Odoo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_alias_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_channel_alias_contact
-#: model:ir.model.fields,help:mail.field_res_users_alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_channel__alias_contact
+#: model:ir.model.fields,help:mail.field_res_users__alias_contact
 msgid ""
 "Policy to post a message on the document using the mailgateway.\n"
 "- everyone: everyone can post\n"
@@ -4387,12 +4147,13 @@ msgstr ""
 "- abonnés : seulement les abonnés au canaux de suivi\n"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Powered by"
 msgstr "Fourni par"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_previous_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__previous_type_ids
 msgid "Preceding Activities"
 msgstr "Activités précédentes"
 
@@ -4402,8 +4163,8 @@ msgid "Preferred reply address"
 msgstr "Adresse de réponse privilégiée"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,help:mail.field_mail_template_reply_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,help:mail.field_mail_template__reply_to
 msgid "Preferred response address (placeholders may be used here)"
 msgstr ""
 "Adresse de réponse préférée (des variables peuvent être utilisées ici)"
@@ -4419,27 +4180,27 @@ msgid "Preview of"
 msgstr "Aperçu de"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_previous_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__previous_activity_type_id
 msgid "Previous Activity Type"
 msgstr "Type d'activité précédente"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_public
+#: model:ir.model.fields,field_description:mail.field_mail_channel__public
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Privacy"
 msgstr "Confidentialité"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:56
-#: code:addons/mail/static/src/xml/client_action.xml:176
+#: code:addons/mail/static/src/xml/discuss.xml:56
+#: code:addons/mail/static/src/xml/discuss.xml:176
 #, python-format
 msgid "Private Channels"
 msgstr "Chaines privées"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:848
+#: code:addons/mail/static/src/js/discuss.js:863
 #, python-format
 msgid "Public Channels"
 msgstr "Canaux publics"
@@ -4468,68 +4229,72 @@ msgid "Received"
 msgstr "Reçu"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_id
 msgid "Recipient"
 msgstr "Destinataire"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Recipients"
 msgstr "Destinataires"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_recommended_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__recommended_activity_type_id
 msgid "Recommended Activity Type"
 msgstr "Type d'activité recommandée"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_next_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__next_type_ids
 msgid "Recommended Next Activities"
 msgstr "Activités suivantes recommandées"
 
 #. module: mail
-#: 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_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
 msgid "Record Thread ID"
 msgstr "ID de l'enregistrement du fil"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_references
+#: model:ir.model.fields,field_description:mail.field_mail_mail__references
 msgid "References"
 msgstr "Références"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_res_id
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Regards,"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__res_id
 msgid "Related Document ID"
 msgstr "ID du document associé"
 
 #. 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_mail_model
-#: model:ir.model.fields,field_description:mail.field_mail_message_model
-#: model:ir.model.fields,field_description:mail.field_mail_template_model
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_model
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_model
+#: 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_compose_message__model
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_model
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__model
 msgid "Related Document Model"
 msgstr "Modèle de document concerné"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_model
 msgid "Related Document Model Name"
 msgstr "Nom de modèle de document associé"
 
@@ -4539,12 +4304,12 @@ msgid "Related Message"
 msgstr "Message lié"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__partner_id
 msgid "Related Partner"
 msgstr "Partenaire associé"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__relation_field
 msgid "Relation field"
 msgstr "Champ relation"
 
@@ -4564,17 +4329,17 @@ msgstr "Retirer cet abonné"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:203
+#: code:addons/mail/static/src/xml/thread.xml:208
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Reply"
 msgstr "Répondre"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,help:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,help:mail.field_mail_message_reply_to
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,help:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,help:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,help:mail.field_mail_message__reply_to
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__reply_to
 msgid ""
 "Reply email address. Setting the reply_to bypasses the automatic thread "
 "creation."
@@ -4583,45 +4348,45 @@ msgstr ""
 " automatique de fil."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_reply_to
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__reply_to
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__reply_to
 msgid "Reply-To"
 msgstr "Répondre à"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_name
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_name
 msgid "Report Filename"
 msgstr "Nom du fichier du rapport"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_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"
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_user_id
+msgid "Responsible User"
 msgstr "Responsable"
 
 #. module: mail
@@ -4631,12 +4396,12 @@ msgid "Retry"
 msgstr "Réessayer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body_html
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body_html
 msgid "Rich-text Contents"
 msgstr "Contenus textes enrichis"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_body_html
+#: model:ir.model.fields,help:mail.field_mail_mail__body_html
 msgid "Rich-text/HTML message"
 msgstr "Message Texte enrichi/HTML"
 
@@ -4646,7 +4411,7 @@ msgid "SMTP Server"
 msgstr "Serveur SMTP"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_res_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__res_id
 msgid "Sample Document"
 msgstr "Document exemple"
 
@@ -4680,26 +4445,26 @@ msgid "Schedule activity"
 msgstr "Planifier une activité"
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:250
+#: code:addons/mail/models/mail_activity.py:260
 #, python-format
 msgid "Schedule an Activity"
 msgstr "Planifier une activité"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:57
 #, python-format
 msgid "Schedule an activity"
 msgstr "Planifier une activité"
 
 #. 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
+#: 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"
 msgstr "Date prévue"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__scheduled_date
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Scheduled Send Date"
 msgstr "Date d'envoi planifiée"
@@ -4715,8 +4480,8 @@ msgid "Search Groups"
 msgstr "Chercher dans les groupes"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__model_object_field
 msgid ""
 "Select target field from the related document model.\n"
 "If it is a relationship field you will be able to select a target field at the destination of the relationship."
@@ -4731,19 +4496,19 @@ msgstr "Sélectionnez un groupe d'utilisateurs "
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:374
+#: code:addons/mail/static/src/js/composer.js:428
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Send"
 msgstr "Envoyer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail
 msgid "Send Email"
 msgstr "Envoyer un courriel"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:264
+#: code:addons/mail/models/mail_template.py:295
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Envoyer le courriel (%s)"
@@ -4769,13 +4534,13 @@ msgid "Send message"
 msgstr "Envoyer un message"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
+#: model:ir.model.fields,field_description:mail.field_mail_channel__email_send
 msgid "Send messages by email"
 msgstr "Envoyer les messages par courriel"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_from
-#: model:ir.model.fields,help:mail.field_mail_template_email_from
+#: model:ir.model.fields,help:mail.field_email_template_preview__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 "
 "value will be the author's email alias if configured, or email address."
@@ -4786,14 +4551,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Sending Error"
 msgstr "Erreur d'Envoi"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:108
+#: code:addons/mail/static/src/xml/discuss.xml:108
 #, python-format
 msgid "Sends messages by email"
 msgstr "Envoyer les messages par courriel"
@@ -4805,25 +4570,30 @@ msgid "Sent"
 msgstr "Envoyer par email"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_email
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "Sent by"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_email
 msgid "Sent by Email"
 msgstr "Envoyé par courriel"
 
 #. 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
+#: 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 "Séquence"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Settings"
 msgstr "Configuration"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__shortcode_type
 msgid "Shortcode Type"
 msgstr "Type de code court"
 
@@ -4834,7 +4604,7 @@ msgid "Shortcodes"
 msgstr "Codes courts"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__source
 msgid "Shortcut"
 msgstr "Raccourci"
 
@@ -4847,20 +4617,20 @@ msgstr ""
 "actions est pour aujourd'hui ou avant. "
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:667
+#: code:addons/mail/models/mail_channel.py:673
 #, python-format
 msgid "Show an helper message"
 msgstr "Montrer un message d'aide"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,field_description:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_mail_template__ref_ir_act_window
 msgid "Sidebar action"
 msgstr "Action de la barre latérale"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,help:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_mail_template__ref_ir_act_window
 msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
@@ -4869,10 +4639,10 @@ msgstr ""
 "enregistrements associés au modèle de document"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_avatar
 msgid ""
 "Small-sized image of this contact. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4883,12 +4653,12 @@ msgstr ""
 "Utiliser ce champ partout où une petite image est nécessaire."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_small
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_small
 msgid "Small-sized photo"
 msgstr "Photo petit format"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_small
+#: model:ir.model.fields,help:mail.field_mail_channel__image_small
 msgid ""
 "Small-sized photo of the group. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4904,82 +4674,62 @@ msgid "Smiley"
 msgstr "Smiley"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_res_model_id
+#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_id
 msgid ""
 "Specify a model if the activity should be specific to a model and not "
 "available when managing activities for other models."
 msgstr ""
+"Spécifiez un modèle si l'activité doit être propre à un certain modèle et "
+"non disponible lors de la gestion des activités des autres modèles."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:661
-#: code:addons/mail/static/src/xml/client_action.xml:28
-#: code:addons/mail/static/src/xml/client_action.xml:156
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred
+#: code:addons/mail/static/src/js/services/chat_manager.js:89
+#: code:addons/mail/static/src/xml/discuss.xml:28
+#: code:addons/mail/static/src/xml/discuss.xml:156
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred
 #, python-format
 msgid "Starred"
 msgstr "Favoris"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_state
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_state
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_mail_activity__state
 msgid "State"
 msgstr "État"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_state
+#: 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
 msgid "Status"
 msgstr "Statut"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,help:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,help:mail.field_event_track_activity_state
-#: model:ir.model.fields,help:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,help:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,help:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,help:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,help:mail.field_product_template_activity_state
-#: model:ir.model.fields,help:mail.field_project_task_activity_state
-#: model:ir.model.fields,help:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,help:mail.field_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
+#: model:ir.model.fields,help:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,help:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,help:mail.field_event_track__activity_state
+#: model:ir.model.fields,help:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,help:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,help:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,help:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,help:mail.field_note_note__activity_state
+#: model:ir.model.fields,help:mail.field_product_product__activity_state
+#: model:ir.model.fields,help:mail.field_product_template__activity_state
+#: model:ir.model.fields,help:mail.field_project_task__activity_state
+#: model:ir.model.fields,help:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,help:mail.field_repair_order__activity_state
+#: model:ir.model.fields,help:mail.field_res_partner__activity_state
+#: model:ir.model.fields,help:mail.field_res_users__activity_state
+#: model:ir.model.fields,help:mail.field_sale_order__activity_state
+#: model:ir.model.fields,help:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,help:mail.field_survey_survey__activity_state
 msgid ""
 "Status based on activities\n"
 "Overdue: Due date is already passed\n"
@@ -4992,33 +4742,33 @@ msgstr ""
 "Planifiée : activités futures"
 
 #. 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
+#: 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"
 msgstr "Sous champ"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,field_description:mail.field_mail_template_sub_object
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,field_description:mail.field_mail_template__sub_object
 msgid "Sub-model"
 msgstr "Sous-modèle"
 
 #. module: mail
 #. 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_mail_compose_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_mail_subject
-#: model:ir.model.fields,field_description:mail.field_mail_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_template_subject
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subject
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__subject
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_mail__subject
+#: model:ir.model.fields,field_description:mail.field_mail_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_template__subject
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subject
 #, python-format
 msgid "Subject"
 msgstr "Sujet"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_subject
-#: model:ir.model.fields,help:mail.field_mail_template_subject
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr "Sujet (des variables peuvent être utilisées ici)"
@@ -5030,22 +4780,22 @@ msgstr "Sujet..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:216
+#: code:addons/mail/static/src/xml/thread.xml:221
 #, python-format
 msgid "Subject:"
 msgstr "Sujet"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_substitution
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__substitution
 msgid "Substitution"
 msgstr "Substitution"
 
 #. module: mail
-#: 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_1993
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subtype_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subtype_id
 #: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
 msgid "Subtype"
 msgstr "Sous-type"
@@ -5057,8 +4807,8 @@ msgid "Subtypes"
 msgstr "Sous-types"
 
 #. 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
+#: 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 "Résumé"
 
@@ -5070,7 +4820,7 @@ msgid "System notification"
 msgstr "Notification Système"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,help:mail.field_mail_activity__has_recommended_activities
 msgid "Technical field for UX purpose"
 msgstr "Champ technique à des fins d'expérience utilisateur"
 
@@ -5080,6 +4830,14 @@ msgid "Template Preview"
 msgstr "Aperçu du modèle"
 
 #. module: mail
+#: code:addons/mail/models/mail_template.py:264
+#, python-format
+msgid ""
+"Template rendering failed, this could mean that your template contains "
+"python syntax errors"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_template_tree_all
 #: model:ir.ui.menu,name:mail.menu_email_templates
 #: model:ir.ui.view,arch_db:mail.email_template_form
@@ -5089,14 +4847,24 @@ msgid "Templates"
 msgstr "Modèles"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The"
+msgstr "Le"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The email sent to"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_shortcode__substitution
 msgid "The escaped html code replacing the shortcut"
 msgstr "Le code HTML avec caractères d'échappement remplaçant le raccourci"
 
 #. module: mail
-#: 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_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
 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 "
@@ -5108,9 +4876,9 @@ msgstr ""
 "projet)"
 
 #. module: mail
-#: 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_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
 msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
@@ -5119,9 +4887,9 @@ msgstr ""
 "e-mails de <carrieres@example.odoo.com>"
 
 #. module: mail
-#: 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_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
 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 "
@@ -5135,9 +4903,9 @@ msgstr ""
 "trouvé pour cette adresse."
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:165
-#: code:addons/mail/models/mail_message.py:579
-#: code:addons/mail/models/mail_message.py:674
+#: code:addons/mail/models/mail_activity.py:175
+#: code:addons/mail/models/mail_message.py:578
+#: code:addons/mail/models/mail_message.py:678
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -5149,20 +4917,20 @@ msgstr ""
 "(Type de document : %s, Opération : %s)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__source
 msgid "The shortcut which must be replaced in the Chat Messages"
 msgstr ""
 "Le raccourci qui doit être remplacé dans les messages du chat de discussion"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__unicode_source
 msgid "The source is replaced by this unicode character in the Chat Messages"
 msgstr ""
 "La source est remplacée par ce caractère Unicode dans les messages du chat"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,help:mail.field_mail_template_model_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,help:mail.field_mail_template__model_id
 msgid "The type of document this template can be used with"
 msgstr "Type de document avec lequel ce modèle peut être utilisé"
 
@@ -5172,7 +4940,7 @@ msgid "This"
 msgstr "Ce"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image
+#: model:ir.model.fields,help:mail.field_mail_channel__image
 msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
@@ -5181,7 +4949,7 @@ msgstr ""
 "limitée à 1024x1024px."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_public
+#: model:ir.model.fields,help:mail.field_mail_channel__public
 msgid ""
 "This group is visible by non members. Invisible groups can add members "
 "through the invite button."
@@ -5195,20 +4963,20 @@ msgid "Thread"
 msgstr "Discussion"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_to
 msgid "To"
 msgstr "A"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_to
 msgid "To (Emails)"
 msgstr "Pour (courriels)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_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
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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)"
 msgstr "Pour (partenaires)"
 
@@ -5223,8 +4991,8 @@ msgstr "À:"
 #. module: mail
 #. openerp-web
 #: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:25
-#: code:addons/mail/static/src/js/thread.js:242
+#: code:addons/mail/static/src/js/activity.js:82
+#: code:addons/mail/static/src/js/thread.js:328
 #: code:addons/mail/static/src/xml/systray.xml:75
 #: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
 #: selection:hr.applicant,activity_state:0
@@ -5234,12 +5002,12 @@ msgstr "À:"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -5261,7 +5029,7 @@ msgstr "À faire"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:35
+#: code:addons/mail/static/src/js/activity.js:92
 #, python-format
 msgid "Tomorrow"
 msgstr "Demain"
@@ -5272,10 +5040,10 @@ msgid "Topics discussed in this group..."
 msgstr "Sujets discutés dans ce groupe..."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid ""
 "Tracked values are stored in a separate model. This field allow to "
 "reconstruct the tracking and to generate statistics on the model."
@@ -5284,7 +5052,7 @@ msgstr ""
 "de reconstruire le suivi et de générer des statistiques sur le modèle."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,field_description:mail.field_ir_model_fields__track_visibility
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Tracking"
 msgstr "Suivi"
@@ -5302,28 +5070,28 @@ msgid "Tracking Values"
 msgstr "Valeurs du suivi"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid "Tracking values"
 msgstr "Suivi des valeurs"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_type
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_type
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_type
 msgid "Type"
 msgstr "Type"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_uuid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__uuid
 msgid "UUID"
 msgstr "UUID"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:235
+#: code:addons/mail/models/mail_mail.py:233
 #, python-format
 msgid "Unable to connect to SMTP Server"
 msgstr "Impossible de se connecter au serveur SMTP"
@@ -5338,7 +5106,6 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:700
 #: code:addons/mail/static/src/xml/followers.xml:22
 #, python-format
 msgid "Unfollow"
@@ -5353,143 +5120,145 @@ msgstr ""
 "un alias unique"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__unicode_source
 msgid "Unicode Character"
 msgstr "Caractère Unicode"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread
 msgid "Unread Messages"
 msgstr "Messages non lus"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread_counter
 msgid "Unread Messages Counter"
 msgstr "Compteur de messages non lus"
 
@@ -5500,61 +5269,61 @@ msgstr "Messages non lus"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all"
 msgstr "Tout enlever des favoris"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all messages"
 msgstr "Enlever tous les messages des favoris"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe"
 msgstr "Se désabonner"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe from channel"
 msgstr "Se désabonner du canal"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:510
+#: code:addons/mail/models/mail_template.py:504
 #, python-format
 msgid "Unsupported report type %s found."
 msgstr "Type de rapport non pris en charge détecté (%s)."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:322
+#: code:addons/mail/static/src/xml/thread.xml:327
 #, python-format
 msgid "Uploading"
 msgstr "Téléchargement en cours..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Uploading error"
 msgstr "Erreur de transmission"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_use_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_use_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__use_active_domain
 msgid "Use active domain"
 msgstr "Utiliser un domaine actif"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_template_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_template_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__template_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__template_id
 msgid "Use template"
 msgstr "Utiliser un modèle"
 
@@ -5564,7 +5333,7 @@ msgid "Use your own email servers"
 msgstr "Utilisez votre propre serveur mail"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_sequence
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__sequence
 msgid "Used to order subtypes."
 msgstr "Utilisé pour commander des sous-types."
 
@@ -5577,7 +5346,7 @@ msgstr "Utilisateur"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:51
+#: code:addons/mail/static/src/xml/discuss.xml:51
 #: code:addons/mail/static/src/xml/extended_chat_window.xml:8
 #, python-format
 msgid "User name"
@@ -5589,7 +5358,7 @@ msgid "Users"
 msgstr "Utilisateurs"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:711
+#: code:addons/mail/models/mail_channel.py:717
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Utilisateurs dans ce canal: %s %s et vous."
@@ -5607,17 +5376,17 @@ msgstr ""
 "(@mycompany.odoo.com)."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:670
+#: code:addons/mail/models/mail_thread.py:696
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 #, python-format
 msgid "View"
 msgstr "Voir"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:668
+#: code:addons/mail/models/mail_thread.py:694
 #, python-format
 msgid "View %s"
-msgstr ""
+msgstr "Voir %s"
 
 #. module: mail
 #. openerp-web
@@ -5632,8 +5401,8 @@ msgstr ""
 "Si vous enlevez un abonné, il ne sera pas averti des emails ou des discussions sur ce document. Voulez-vous vraiment enlever cet abonné?"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_sub_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__sub_model_object_field
 msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
@@ -5643,8 +5412,8 @@ msgstr ""
 "destination (sous-modèle)."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,help:mail.field_mail_template_sub_object
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,help:mail.field_mail_template__sub_object
 msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
@@ -5653,19 +5422,19 @@ msgstr ""
 "indique le modèle de document vers lequel la relation va."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,help:mail.field_ir_model_fields__track_visibility
 msgid ""
 "When set, every modification to this field will be tracked in the chatter."
 msgstr "Activez pour suivre les modifications de ce champ dans le chatter."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_is_log
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_is_log
+#: model:ir.model.fields,help:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__is_log
 msgid "Whether the message is an internal note (comment mode only)"
 msgstr "Si un message est une note interne (en mode commentaire seulement)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,help:mail.field_ir_model__is_mail_thread
 msgid "Whether this model supports messages and notifications."
 msgstr "Si coché, ce modèle supporte les messages et les notifications"
 
@@ -5683,47 +5452,47 @@ msgstr "Rédiger un commentaire"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:12
+#: code:addons/mail/static/src/xml/composer.xml:11
 #, python-format
-msgid "Write something..."
-msgstr "Écrivez quelque chose..."
+msgid "Write Something..."
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:29
-#: code:addons/mail/static/src/js/thread.js:244
+#: code:addons/mail/static/src/js/activity.js:86
+#: code:addons/mail/static/src/js/thread.js:330
 #, python-format
 msgid "Yesterday"
 msgstr "Hier"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:96
+#: code:addons/mail/static/src/js/discuss.js:98
 #, python-format
 msgid "You added <b>%s</b> to the conversation."
 msgstr "Vous avez rajouté  <b>%s</b> à la conversation "
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:708
+#: code:addons/mail/models/mail_channel.py:714
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Vous êtes seul dans ce canal."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:677
+#: code:addons/mail/models/mail_channel.py:683
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "Vous êtes en discussion privée avec <b>@%s</b>."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:672
+#: code:addons/mail/models/mail_channel.py:678
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Vous êtes dans le salon <b>#%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:114
+#: code:addons/mail/static/src/xml/thread.xml:119
 #, python-format
 msgid ""
 "You can mark any message as 'starred', and it shows up in this channel."
@@ -5732,7 +5501,7 @@ msgstr ""
 " ce canal."
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:54
+#: code:addons/mail/models/res_users.py:53
 #, python-format
 msgid ""
 "You cannot create a new user from here.\n"
@@ -5752,14 +5521,11 @@ msgstr ""
 "nécessaire pour d'autres modules."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:349
+#: code:addons/mail/models/mail_thread.py:342
 #, python-format
 msgid ""
-"You could also add a new %(document)s by sending an email to: "
-"%(email_link)s."
+"You could also add a new %(document)s by sending an email to %(email_link)s"
 msgstr ""
-"CVous pouvez également ajouter un nouveau %(document)s en envoyant un email "
-"à: %(email_link)s"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
@@ -5768,14 +5534,14 @@ msgstr "Vous avez été assigné à "
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "You have been invited to: "
 msgstr "Vous avez été invité à:"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,help:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_template__attachment_ids
 msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
@@ -5785,28 +5551,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:473
+#: code:addons/mail/static/src/js/services/chat_manager.js:1536
 #, python-format
 msgid "You unpinned your conversation with <b>%s</b>."
 msgstr "Vous avez détaché votre conversation avec <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:471
+#: code:addons/mail/static/src/js/services/chat_manager.js:1534
 #, python-format
 msgid "You unsubscribed from <b>%s</b>."
 msgstr "Vous vous êtes désinscrits de <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:217
+#: code:addons/mail/static/src/xml/discuss.xml:217
 #, python-format
 msgid "You:"
 msgstr "Vous :"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Your message has not been sent."
 msgstr "Votre message n'a pas été envoyé. "
@@ -5818,23 +5584,35 @@ msgid "Your template should define email_from"
 msgstr "Votre modèle doit définir un email_from"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "alias %s: %s"
 msgstr "alias %s : %s"
 
 #. module: mail
+#: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
+msgid "base.partner.merge.automatic.wizard"
+msgstr "base.partner.merge.automatic.wizard"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "by"
 msgstr "par"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid ""
+"cannot be processed. This address\n"
+"    is used to collect replies and should not be used to directly contact"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "créé"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:315
+#: code:addons/mail/models/mail_thread.py:309
 #, python-format
 msgid "document"
 msgstr "document"
@@ -5855,7 +5633,7 @@ msgstr "Ex. : Proposition d'examen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "enable desktop notifications"
 msgstr "activer les notifications de bureau"
@@ -5890,16 +5668,17 @@ msgid "has been"
 msgstr "a été"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:282
+#: code:addons/mail/models/mail_alias.py:271
 #, python-format
 msgid "incorrectly configured alias"
 msgstr "alias mal configuré"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:278
+#: code:addons/mail/models/mail_alias.py:267
 #, python-format
 msgid "incorrectly configured alias (unknown reference record)"
 msgstr ""
+"configuration de l'alias non valide (enregistrement de référence inconnu)"
 
 #. module: mail
 #: model:ir.model,name:mail.model_ir_actions_server
@@ -5917,19 +5696,19 @@ msgid "mail.alias.mixin"
 msgstr "mail.alias.mixin"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:943
+#: code:addons/mail/models/mail_thread.py:925
 #, python-format
 msgid "model %s does not accept document creation"
 msgstr "Le modèle %s n'accepte pas la création de documents"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:938
+#: code:addons/mail/models/mail_thread.py:920
 #, python-format
 msgid "model %s does not accept document update"
 msgstr "Le modèle %s n'accepte pas la mise à jour de documents"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:931
+#: code:addons/mail/models/mail_thread.py:913
 #, python-format
 msgid ""
 "model %s does not accept document update, fall back on document creation"
@@ -5956,14 +5735,14 @@ msgstr "maintenant"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:177
+#: code:addons/mail/static/src/xml/thread.xml:181
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "on"
 msgstr "le"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid ""
 "posting a message without model should be with a null res_id (private "
@@ -5973,7 +5752,7 @@ msgstr ""
 "(message privé), reçu : %s"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:917
+#: code:addons/mail/models/mail_thread.py:899
 #, python-format
 msgid ""
 "posting a message without model should be with a parent_id (private message)"
@@ -6006,13 +5785,13 @@ msgid "record:"
 msgstr "enregistrement:"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:935
+#: code:addons/mail/models/mail_thread.py:917
 #, python-format
 msgid "reply to missing document (%s,%s)"
 msgstr "réponse à un document manquant (%s,%s)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:928
+#: code:addons/mail/models/mail_thread.py:910
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
 msgstr ""
@@ -6024,40 +5803,45 @@ msgid "res.config.settings"
 msgstr "res.config.settings"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid "resetting thread_id"
 msgstr "réinitialisation de l'ID thread_id"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:254
+#: code:addons/mail/models/mail_channel.py:252
 #, python-format
 msgid "restricted to channel members"
 msgstr "limité aux membres du canal"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:287
+#: code:addons/mail/models/mail_alias.py:276
 #, python-format
 msgid "restricted to followers"
 msgstr "limité aux abonnés"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:291
+#: code:addons/mail/models/mail_alias.py:280
 #, python-format
 msgid "restricted to known authors"
 msgstr "limité aux auteurs connus"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:899
 #: code:addons/mail/models/mail_thread.py:917
-#: code:addons/mail/models/mail_thread.py:935
-#: code:addons/mail/models/mail_thread.py:938
-#: code:addons/mail/models/mail_thread.py:943
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:920
+#: code:addons/mail/models/mail_thread.py:925
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "skipping"
 msgstr "ignorer"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "team."
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:20
 #, python-format
@@ -6065,13 +5849,18 @@ msgid "this document"
 msgstr "ce document"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "unknown error"
 msgstr "erreur inconnue"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:906
+#: code:addons/mail/models/mail_thread.py:888
 #, python-format
 msgid "unknown target model %s"
 msgstr "modèle cible inconnu %s"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "using"
+msgstr ""
diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po
index 322200dc278..6a52d25ed9c 100644
--- a/addons/mail/i18n/hr.po
+++ b/addons/mail/i18n/hr.po
@@ -3,8 +3,8 @@
 # * mail
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Tina Milas <tina@uvid.hr>, 2017
+# Martin Trigaux, 2017
+# Tina Milas, 2017
 # Karolina Tonković <karolina.tonkovic@storm.hr>, 2017
 # Bole <bole@dajmi5.com>, 2017
 # Đurđica Žarković <durdica.zarkovic@storm.hr>, 2017
@@ -17,10 +17,10 @@
 # Stjepan Lovasić <stjepan.lovasic@gmail.com>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.1\n"
+"Project-Id-Version: Odoo Server saas~11.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-13 14:36+0000\n"
-"PO-Revision-Date: 2017-12-13 14:36+0000\n"
+"POT-Creation-Date: 2018-03-22 14:10+0000\n"
+"PO-Revision-Date: 2018-03-22 14:10+0000\n"
 "Last-Translator: Stjepan Lovasić <stjepan.lovasic@gmail.com>, 2017\n"
 "Language-Team: Croatian (https://www.transifex.com/odoo/teams/41243/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -30,169 +30,60 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_data_notification_email_default
-msgid ""
-"\n"
-"% set company = ctx.get('company', user.company_id)\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"
-"        <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-"        <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
-"    </div>\n"
-"</div>\n"
-"% endif\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('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('has_button_follow'):\n"
-"        % if ctx.get('has_button_access'):\n"
-"           |\n"
-"        % endif\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=\"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=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
-"        % endfor\n"
-"        % endif\n"
-"    </td>\n"
-"    <td valign=\"center\" align=\"right\">\n"
-"        <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\">\n"
-"    </td>\n"
-"</tr>\n"
-"<tr>\n"
-"    <td colspan=\"2\" style=\"text-align:center;\">\n"
-"        <hr width=\"100%\"\n"
-"            style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
-"        % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
-"        <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n"
-"            <strong>Internal communication</strong>: Replying will post an internal note. Followers won't receive any email notification.\n"
-"        </p>\n"
-"        % endif\n"
-"    </td>\n"
-"</tr>\n"
-"</tbody></table>\n"
-"</div>\n"
-"% endif\n"
-"<div>\n"
-"    ${object.body | safe}\n"
-"</div>\n"
-"% if ctx.get('tracking'):\n"
-"    <ul>\n"
-"    % for tracking in ctx['tracking']\n"
-"        <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
-"    % endfor\n"
-"    </ul>\n"
-"% endif\n"
-"\n"
-"% if ctx.get('signature'):\n"
-"    ${ctx['signature'] | safe}\n"
-"% endif\n"
-"<br/>\n"
-"<p style=\"color: #555555;\">\n"
-"    Sent by\n"
-"    % if ctx.get('website_url'):\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 target=\"_blank\" 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:674
+#: code:addons/mail/models/mail_channel.py:680
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
 "Ovaj kanal je privatni, da bi se priključili ljudi moraju biti pozvani."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_days
-msgid "# Days"
-msgstr "# Dana"
-
-#. 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) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-msgstr ""
-"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:63
+#: code:addons/mail/static/src/js/services/chat_manager.js:1634
 #, python-format
 msgid "%d Messages"
 msgstr "%d poruka"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:31
+#: code:addons/mail/static/src/js/activity.js:88
 #, python-format
 msgid "%d days overdue"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:248
+#: code:addons/mail/models/mail_template.py:279
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopija)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:236
+#: code:addons/mail/models/mail_thread.py:234
 #, python-format
 msgid "%s created"
 msgstr "%s kreiran"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:81
+#: code:addons/mail/models/res_users.py:80
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s se priključio %s mreži."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:211
 #, python-format
 msgid "&nbsp;("
 msgstr "&nbsp;("
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:179
+#: code:addons/mail/static/src/xml/thread.xml:184
 #, python-format
 msgid "(from"
 msgstr "(od"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,help:mail.field_mail_shortcode__shortcode_type
 msgid ""
 "* Smiley are only used for HTML code to display an image * Text (default "
 "value) is used to substitute text with another text"
@@ -209,7 +100,7 @@ msgstr ", dospjelo na"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:331
+#: code:addons/mail/static/src/xml/thread.xml:336
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr "-------- Pokaži starije poruke --------"
@@ -236,7 +127,7 @@ msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:684
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -252,7 +143,16 @@ msgstr ""
 "Možete ubaciti gotove odgovore u svoje odgovore tako da utipkate <b>:prečac</b>.<br>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:584
+#: code:addons/mail/models/mail_channel.py:507
+#, python-format
+msgid ""
+"<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
+"href=\"#\" class=\"o_channel_redirect\" data-oe-"
+"id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:590
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -262,8 +162,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:508
-#: code:addons/mail/models/mail_channel.py:561
+#: code:addons/mail/models/mail_channel.py:514
+#: code:addons/mail/models/mail_channel.py:567
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -384,6 +284,11 @@ msgstr ""
 "                                    <span class=\"o_stat_text\">Context Action</span>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+msgid "<span class=\"oe_inline\">days</span>"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>\n"
@@ -400,6 +305,13 @@ msgid "<strong> Feedback</strong>"
 msgstr ""
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid ""
+"<strong>Internal communication</strong>: Replying will post an internal "
+"note. Followers won't receive any email notification."
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>Only records checked in list view will be used.</strong><br/>\n"
@@ -412,9 +324,9 @@ msgid "<strong>Recommended Activities</strong>"
 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_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
 msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
@@ -437,115 +349,118 @@ msgid "Access Groups"
 msgstr "Grupe"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction
 msgid "Action Needed"
 msgstr "Potrebna dodatna radnja"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__default
 msgid "Activated by default when subscribing."
 msgstr "Standardno aktivirano kod pretplate"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__active
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_search
 msgid "Active"
 msgstr "Aktivan"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__active_domain
 msgid "Active domain"
 msgstr "Aktivna domena"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/systray.xml:87
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_ids
-#: model:ir.model.fields,field_description:mail.field_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.model.fields,field_description:mail.field_account_invoice__activity_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_ids
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
 #: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 #: model:mail.message.subtype,name:mail.mt_activities
@@ -557,7 +472,7 @@ msgstr "Aktivnosti"
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:60
 #: model:ir.model,name:mail.model_mail_activity
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_type_id
+#: 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
@@ -571,6 +486,32 @@ msgid "Activity Mixin"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_state
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_state
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_state
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_state
+msgid "Activity State"
+msgstr "Status aktivnosti"
+
+#. 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"
@@ -592,7 +533,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:87
+#: code:addons/mail/static/src/xml/discuss.xml:87
 #, python-format
 msgid "Add"
 msgstr "Dodaj"
@@ -600,7 +541,7 @@ msgstr "Dodaj"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:64
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_channel_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__channel_ids
 #, python-format
 msgid "Add Channels"
 msgstr "Dodaj kanal"
@@ -608,7 +549,7 @@ msgstr "Dodaj kanal"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:61
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_partner_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
 msgid "Add Followers"
@@ -621,22 +562,28 @@ msgid "Add Followers can only be done on a mail thread model"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,field_description:mail.field_mail_template_user_signature
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,field_description:mail.field_mail_template__user_signature
 msgid "Add Signature"
 msgstr "Dodaj potpis"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:41
-#: code:addons/mail/static/src/xml/client_action.xml:186
+#: code:addons/mail/static/src/xml/discuss.xml:41
+#: code:addons/mail/static/src/xml/discuss.xml:186
 #, python-format
 msgid "Add a channel"
 msgstr "Dodaj kanal"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:335
+#, python-format
+msgid "Add a new %(document)s or send an email to %(email_link)s"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:60
+#: code:addons/mail/static/src/xml/discuss.xml:60
 #, python-format
 msgid "Add a private channel"
 msgstr ""
@@ -653,7 +600,7 @@ msgid "Add contacts to notify..."
 msgstr "Dodaj kontakte kojima ide obavijest..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
 msgid "Additional Contacts"
 msgstr "Dodatni kontakti"
 
@@ -668,45 +615,45 @@ msgid "Advanced Settings"
 msgstr "Napredne postavke"
 
 #. 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_res_users_alias_id
+#: 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_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
 msgid "Alias"
 msgstr "Alias"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_contact
+#: 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
+#: model:ir.model.fields,field_description:mail.field_res_users__alias_contact
 msgid "Alias Contact Security"
 msgstr "Alias Kontakt za osiguranje"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__alias_domain
 msgid "Alias Domain"
 msgstr "alias domena"
 
 #. module: mail
-#: 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_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
 msgid "Alias Name"
 msgstr "Alias Ime"
 
 #. module: mail
-#: 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_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
 msgid "Alias domain"
 msgstr "Alias domena"
 
 #. module: mail
-#: 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_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
 msgid "Aliased Model"
 msgstr "Zamjenski model"
 
@@ -731,16 +678,16 @@ msgstr "Uvijek"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:198
+#: code:addons/mail/static/src/js/services/chat_manager.js:1328
 #, python-format
 msgid "Anonymous"
 msgstr "Anoniman"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__no_auto_thread
 msgid ""
 "Answers do not go in the original document discussion thread. This has an "
 "impact on the generated message-id."
@@ -749,8 +696,8 @@ msgstr ""
 " na generirani id poruke."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_id
 msgid "Applies to"
 msgstr "Odnosi se na"
 
@@ -762,9 +709,14 @@ msgid "Apply"
 msgstr "Primjeni"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+msgid "Archived"
+msgstr "Arhivirano"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:45
-#: model:ir.model.fields,field_description:mail.field_mail_activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
 #, python-format
 msgid "Assigned to"
 msgstr "Dodijeljeno"
@@ -775,19 +727,19 @@ msgid "Attach a file"
 msgstr "Priloži datoteku"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_template__attachment_ids
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Attachments"
 msgstr "Privitci"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_message_attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_message__attachment_ids
 msgid ""
 "Attachments are linked to a document through model / res_id and to the "
 "message through this field."
@@ -806,10 +758,10 @@ msgid "Authenticated Partners"
 msgstr "Ovjereni partneri"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_id
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Author"
 msgstr "Autor"
@@ -820,10 +772,10 @@ msgid "Author Signature (mass mail only)"
 msgstr "Potpis autora (samo za masovnu poštu)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,help:mail.field_mail_mail_author_id
-#: model:ir.model.fields,help:mail.field_mail_message_author_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,help:mail.field_mail_mail__author_id
+#: model:ir.model.fields,help:mail.field_mail_message__author_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_id
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that"
 " did not match any partner."
@@ -832,27 +784,27 @@ msgstr ""
 " koja nije odgovarala niti jednom partneru."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_avatar
 msgid "Author's avatar"
 msgstr "Avatar autora"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_public_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_public_id
 msgid "Authorized Group"
 msgstr "Ovlaštena grupa"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_template__auto_delete
 msgid "Auto Delete"
 msgstr "Auto brisanje"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_ids
 msgid "Auto Subscription"
 msgstr "auto pretplata"
 
@@ -874,16 +826,16 @@ msgid "Be careful with channels following internal notifications"
 msgstr "Budite oprezni s kanalima koji prate interne obavijesti"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
-#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
 msgid "Body"
 msgstr "Tijelo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,field_description:mail.field_res_users_message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_users__message_bounce
 msgid "Bounce"
 msgstr "Odbij"
 
@@ -929,32 +881,32 @@ msgid "Canned Response / Shortcode"
 msgstr "Gotovi odgovor / Kratki kod"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_cc
+#: model:ir.model.fields,help:mail.field_mail_mail__email_cc
 msgid "Carbon copy message recipients"
 msgstr "Primatelji skrivene kopije"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,help:mail.field_mail_template_email_cc
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,help:mail.field_mail_template__email_cc
 msgid "Carbon copy recipients (placeholders may be used here)"
 msgstr "Carbon copy primatelji (ovdje se mogu koristiti zamjenski tekstovi)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,help:mail.field_mail_activity_type_category
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,help:mail.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__category
 msgid "Category"
 msgstr "Kategorija"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_cc
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_cc
 msgid "Cc"
 msgstr "Cc (kopija)"
 
@@ -964,40 +916,40 @@ msgid "Change"
 msgstr "Promjeni"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field
 msgid "Changed Field"
 msgstr "Promijenjeno polje"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
 #: selection:mail.channel,channel_type:0
 msgid "Channel"
 msgstr "Kanal"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_message_ids
 msgid "Channel Message"
 msgstr "Poruka na kanalu"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_type
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_type
 msgid "Channel Type"
 msgstr "Tip kanala"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:36
-#: code:addons/mail/static/src/xml/client_action.xml:172
+#: code:addons/mail/static/src/xml/discuss.xml:36
+#: code:addons/mail/static/src/xml/discuss.xml:172
 #: code:addons/mail/static/src/xml/systray.xml:19
 #: code:addons/mail/static/src/xml/systray.xml:36
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__channel_ids
 #: model:ir.ui.menu,name:mail.mail_channel_menu_settings
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
 #, python-format
@@ -1012,7 +964,7 @@ msgstr "Kanali/Partner"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:168
+#: code:addons/mail/static/src/xml/discuss.xml:168
 #: code:addons/mail/static/src/xml/systray.xml:18
 #: code:addons/mail/static/src/xml/systray.xml:32
 #: model:ir.actions.client,name:mail.mail_channel_action_client_chat
@@ -1031,10 +983,10 @@ msgid "Chat Shortcode"
 msgstr "Kratki kod Čavrljanja"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__child_ids
 msgid "Child Messages"
 msgstr "Podređene poruke"
 
@@ -1044,25 +996,6 @@ msgid "Choose an example"
 msgstr "Izaberi primjer"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:342
-#, python-format
-msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
-msgstr ""
-"Klikni za dodavanje novog %(document)s ili slanje e-mail poruke: "
-"%(email_link)s"
-
-#. module: mail
-#: code:addons/mail/models/mail_thread.py:358
-#, python-format
-msgid "Click here to add new %s"
-msgstr "Klikni za dodavanje novog %s"
-
-#. module: mail
-#: model:ir.actions.act_window,help:mail.mail_shortcode_action
-msgid "Click to define a new chat shortcode."
-msgstr "Kliknite za definiranje novog kratkog koda."
-
-#. module: mail
 #: selection:mail.channel.partner,fold_state:0
 msgid "Closed"
 msgstr "Zatvoren"
@@ -1078,8 +1011,8 @@ msgid "Comma-separated ids of recipient partners"
 msgstr "Ids primatelja odvojeni zarezima"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_partner_to
-#: model:ir.model.fields,help:mail.field_mail_template_partner_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr ""
@@ -1092,8 +1025,8 @@ msgid "Comma-separated recipient addresses"
 msgstr "Adrese primatelja odvojene zarezom"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,help:mail.field_mail_template_email_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,help:mail.field_mail_template__email_to
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr "Adrese primatelja odvojene zarezom"
 
@@ -1112,8 +1045,8 @@ msgid "Compose Email"
 msgstr "Sastavi e-poštu"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_composition_mode
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__composition_mode
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__composition_mode
 msgid "Composition mode"
 msgstr "Mod sastavljanja"
 
@@ -1124,14 +1057,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:109
+#: code:addons/mail/static/src/xml/thread.xml:114
 #, python-format
 msgid "Congratulations, your inbox is empty"
 msgstr "Čestitamo! Vaš inbox je prazan"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:647
+#: code:addons/mail/static/src/js/discuss.js:662
 #, python-format
 msgid "Congratulations, your inbox is empty!"
 msgstr ""
@@ -1148,20 +1081,20 @@ msgid "Content"
 msgstr "Sadržaj"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_body
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body
-#: model:ir.model.fields,field_description:mail.field_mail_message_body
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_body
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__body
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body
+#: model:ir.model.fields,field_description:mail.field_mail_message__body
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__body
 msgid "Contents"
 msgstr "Sadržaj"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_fold_state
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__fold_state
 msgid "Conversation Fold State"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_minimized
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_minimized
 msgid "Conversation is minimized"
 msgstr "Razgovor je minimiziran"
 
@@ -1173,64 +1106,70 @@ msgid "Conversations"
 msgstr "Razgovori"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,help:mail.field_res_users_message_bounce
+#: model:ir.model.fields,help:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,help:mail.field_res_users__message_bounce
 msgid "Counter of the number of bounced emails for this contact"
 msgstr "Broj odbačenih email poruka ovog kontakta"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:307
+#: code:addons/mail/static/src/js/discuss.js:318
 #, python-format
 msgid "Create %s"
 msgstr "Kreiraj %s"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__create_date
 msgid "Create Date"
 msgstr "Kreiraj datum"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:350
+#, python-format
+msgid "Create a new %(document)s"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Created By"
 msgstr "Kreirao"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_uid
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:41
-#: 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
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_date
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_date
 #, python-format
 msgid "Created on"
 msgstr "Datum kreiranja"
@@ -1241,90 +1180,22 @@ msgid "Creation Month"
 msgstr "Mjesec kreiranja"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,help:mail.field_mail_mail_starred
-#: model:ir.model.fields,help:mail.field_mail_message_starred
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_starred
+#: model:ir.model.fields,help:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,help:mail.field_mail_mail__starred
+#: model:ir.model.fields,help:mail.field_mail_message__starred
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__starred
 msgid "Current user has a starred notification linked to this message"
 msgstr "Trenutni korisnik ima označenu obavijest povezanu sa ovom porukom."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_date
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__date
+#: model:ir.model.fields,field_description:mail.field_mail_message__date
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__date
 msgid "Date"
 msgstr "Datum"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,help:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,help:mail.field_event_event_message_last_post
-#: model:ir.model.fields,help:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,help:mail.field_event_track_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_track_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
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,help:mail.field_note_note_message_last_post
-#: model:ir.model.fields,help:mail.field_product_product_message_last_post
-#: model:ir.model.fields,help:mail.field_product_template_message_last_post
-#: model:ir.model.fields,help:mail.field_project_project_message_last_post
-#: model:ir.model.fields,help:mail.field_project_task_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,help:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,help:mail.field_res_users_message_last_post
-#: model:ir.model.fields,help:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,help:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr "Datum zadnjeg zapisa"
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Deadline"
 msgstr "Krajnji rok"
@@ -1335,32 +1206,32 @@ msgid "Dear"
 msgstr "Poštovani"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__default
 msgid "Default"
 msgstr "Zadano"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,field_description:mail.field_mail_template_null_value
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,field_description:mail.field_mail_template__null_value
 msgid "Default Value"
 msgstr "Zadana vrijednost"
 
 #. module: mail
-#: 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_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
 msgid "Default Values"
 msgstr "Zadane vrijednosti"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__use_default_to
 msgid "Default recipients"
 msgstr "Zadani primatelji"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,help:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,help:mail.field_mail_template__use_default_to
 msgid ""
 "Default recipients of the record:\n"
 "- partner (using id on a partner or the partner_id field) OR\n"
@@ -1371,26 +1242,31 @@ msgstr ""
 "- e-mail (pomoću email_from ili e-mail polje)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.actions.act_window,help:mail.mail_shortcode_action
+msgid "Define a new chat shortcode"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete Emails"
 msgstr "Briši poruke"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete_message
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete_message
 msgid "Delete Message Copy"
 msgstr "Briši kopiju poruke"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete sent emails (mass mailing only)"
 msgstr "Briši poslane poruke (samo masonva pošta)"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:320
+#: code:addons/mail/static/src/xml/thread.xml:325
 #, python-format
 msgid "Delete this attachment"
 msgstr "Obriši privitak"
@@ -1401,15 +1277,15 @@ msgid "Delivery Failed"
 msgstr "Isporuka nije uspjela"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_description
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_description
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_description
+#: model:ir.model.fields,field_description:mail.field_mail_channel__description
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__description
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__description
 #: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
 msgid "Description"
 msgstr "Opis"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_description
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__description
 msgid ""
 "Description that will be added in the message posted for this subtype. If "
 "void, the name will be added instead."
@@ -1419,7 +1295,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:46
+#: code:addons/mail/static/src/xml/discuss.xml:46
 #, python-format
 msgid "Direct Messages"
 msgstr "Izravne poruke"
@@ -1450,26 +1326,26 @@ msgid "Discussions"
 msgstr "Rasprave"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_display_name
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__display_name
+#: 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_subtype__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_notification__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_thread__display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__display_name
 msgid "Display Name"
 msgstr "Naziv za prikaz"
 
@@ -1483,13 +1359,13 @@ msgstr ""
 "predloškom"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_res_name
+#: 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
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete_message
 msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
@@ -1503,7 +1379,12 @@ msgid "Document Followers"
 msgstr "Sljedbenici dokumenta"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_name
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_model_id
+msgid "Document Model"
+msgstr "Model dokumenta"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_name
 msgid "Document Name"
 msgstr ""
 
@@ -1524,28 +1405,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:296
+#: code:addons/mail/static/src/xml/thread.xml:301
 #, python-format
 msgid "Download this PDF"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:272
-#: code:addons/mail/static/src/xml/thread.xml:285
-#: code:addons/mail/static/src/xml/thread.xml:308
+#: code:addons/mail/static/src/xml/thread.xml:277
+#: code:addons/mail/static/src/xml/thread.xml:290
+#: code:addons/mail/static/src/xml/thread.xml:313
 #, python-format
 msgid "Download this attachment"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity__date_deadline
 msgid "Due Date"
 msgstr "Datum dospijeća"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:37
+#: code:addons/mail/static/src/js/activity.js:94
 #, python-format
 msgid "Due in %d days"
 msgstr ""
@@ -1577,7 +1458,7 @@ msgid "Edit subscription"
 msgstr "Uredi pretplatu "
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_email
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_email
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 #: model:mail.activity.type,name:mail.mail_activity_data_email
 #: selection:mail.compose.message,message_type:0
@@ -1612,12 +1493,12 @@ msgid "Email Search"
 msgstr "Pretraga e-pošte"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_email_status
+#: model:ir.model.fields,field_description:mail.field_mail_notification__email_status
 msgid "Email Status"
 msgstr "Status poruke"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__template_id
 msgid "Email Template"
 msgstr "predložak emaila"
 
@@ -1637,7 +1518,7 @@ msgid "Email Thread"
 msgstr "Nit e-pošte"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_alias_id
+#: model:ir.model.fields,help:mail.field_res_users__alias_id
 msgid ""
 "Email address internally associated with this user. Incoming emails will "
 "appear in the user's notifications."
@@ -1646,10 +1527,10 @@ msgstr ""
 "pojaviti u korisnikovim obavijestima."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_email_from
-#: model:ir.model.fields,help:mail.field_mail_mail_email_from
-#: model:ir.model.fields,help:mail.field_mail_message_email_from
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,help:mail.field_mail_compose_message__email_from
+#: model:ir.model.fields,help:mail.field_mail_mail__email_from
+#: model:ir.model.fields,help:mail.field_mail_message__email_from
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__email_from
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found and replaces the author_id field in the chatter."
@@ -1687,7 +1568,7 @@ msgid "Error during communication with the publisher warranty server."
 msgstr "Greška tijekom komunikacije sa serverom nositelja održavanja."
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:302
+#: code:addons/mail/models/mail_mail.py:300
 #, python-format
 msgid ""
 "Error without exception. Probably due do sending an email without computed "
@@ -1726,7 +1607,7 @@ msgid "Extended Filters..."
 msgstr "Prošireni filtri..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_fail_counter
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__fail_counter
 msgid "Fail Mail"
 msgstr "Neuspješne poruke"
 
@@ -1736,19 +1617,19 @@ msgid "Failed"
 msgstr "Neuspjelo"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:374
+#: code:addons/mail/models/mail_template.py:368
 #, python-format
 msgid "Failed to render template %r using values %r"
 msgstr "Neuspješno generianje predloška %r korištenjem vrijednosti %r"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,field_description:mail.field_mail_mail__failure_reason
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Failure Reason"
 msgstr "Razlog neuspjeha"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
 msgid ""
 "Failure reason. This is usually the exception thrown by the email server, "
 "stored to ease the debugging of mailing issues."
@@ -1757,45 +1638,45 @@ msgstr ""
 "kako bi se olakšalo ispravljanje pogrešaka u slanju e-mailova."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred_partner_ids
 msgid "Favorited By"
 msgstr "Postavio kao omiljeni"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:215
-#: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
+#: code:addons/mail/static/src/js/activity.js:245
+#: model:ir.model.fields,field_description:mail.field_mail_activity__feedback
 #, python-format
 msgid "Feedback"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_object_field
 msgid "Field"
 msgstr "Polje"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:24
+#: code:addons/mail/models/ir_model.py:30
 #, python-format
 msgid "Field \"Mail Thread\" cannot be changed to \"False\"."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_desc
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_desc
 msgid "Field Description"
 msgstr "Opis polja"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_type
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_type
 msgid "Field Type"
 msgstr "Polje vrsta"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__relation_field
 msgid ""
 "Field used to link the related model to the subtype model when using "
 "automatic subscription on a related document. The field is used to compute "
@@ -1811,8 +1692,8 @@ msgid "Fields"
 msgstr "Polja"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,help:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,help:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,help:mail.field_mail_template__copyvalue
 msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
@@ -1827,7 +1708,6 @@ msgstr "Omotano"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:696
 #: code:addons/mail/static/src/xml/followers.xml:20
 #, python-format
 msgid "Follow"
@@ -1835,208 +1715,211 @@ msgstr "Slijedi"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_followers
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_follower_ids
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: model:ir.ui.view,arch_db:mail.view_followers_tree
 msgid "Followers"
 msgstr "Pratitelji"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_channel_ids
 msgid "Followers (Channels)"
 msgstr "Pratitelji (Kanali)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_partner_ids
 msgid "Followers (Partners)"
 msgstr "Pratitelji (Partneri)"
 
@@ -2065,18 +1948,18 @@ msgid "Following"
 msgstr "Slijedi"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_icon
-#: model:ir.model.fields,help:mail.field_mail_activity_type_icon
+#: 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_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
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_from
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_from
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__email_from
 msgid "From"
 msgstr "Od"
 
@@ -2099,7 +1982,7 @@ msgid "Gateway"
 msgstr "Prolaz"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:55
+#: code:addons/mail/models/res_users.py:54
 #, python-format
 msgid "Go to the configuration panel"
 msgstr "Idi na ploču za konfiguriranje"
@@ -2142,49 +2025,54 @@ msgid "Has attachments"
 msgstr "Ima prilog"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_headers
+#: model:ir.model.fields,field_description:mail.field_mail_mail__headers
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Headers"
 msgstr "Zaglavlja"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_hidden
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Hello"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
 msgid "Hidden"
 msgstr "Skriveno"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_hidden
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__hidden
 msgid "Hide the subtype in the follower options"
 msgstr "Sakrij podtip u opcijama pratitelja"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_id
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__id
+#: 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_subtype__id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__id
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__id
+#: model:ir.model.fields,field_description:mail.field_mail_template__id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__id
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mail
-#: 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_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
 msgid ""
 "ID of the parent record holding the alias (example: project holding the task"
 " creation alias)"
@@ -2193,163 +2081,165 @@ msgstr ""
 "pseudonim pod kojim djelatnik kreira zadatak)"
 
 #. 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
+#: 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 "Ikona"
 
 #. 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
+#: 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"
 msgstr "Id resursa koji se prati"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:119
-#: code:addons/mail/static/src/xml/client_action.xml:203
+#: code:addons/mail/static/src/xml/discuss.xml:119
+#: code:addons/mail/static/src/xml/discuss.xml:203
 #, python-format
 msgid "Idle"
 msgstr "Prazan"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,help:mail.field_event_event_message_unread
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread
-#: model:ir.model.fields,help:mail.field_event_track_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,help:mail.field_note_note_message_unread
-#: model:ir.model.fields,help:mail.field_product_product_message_unread
-#: model:ir.model.fields,help:mail.field_product_template_message_unread
-#: model:ir.model.fields,help:mail.field_project_project_message_unread
-#: model:ir.model.fields,help:mail.field_project_task_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread
-#: model:ir.model.fields,help:mail.field_res_users_message_unread
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,help:mail.field_event_event__message_unread
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread
+#: model:ir.model.fields,help:mail.field_event_track__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,help:mail.field_note_note__message_unread
+#: model:ir.model.fields,help:mail.field_product_product__message_unread
+#: model:ir.model.fields,help:mail.field_product_template__message_unread
+#: model:ir.model.fields,help:mail.field_project_project__message_unread
+#: model:ir.model.fields,help:mail.field_project_task__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread
+#: model:ir.model.fields,help:mail.field_res_users__message_unread
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread
 msgid "If checked new messages require your attention."
 msgstr "Ako je odabrano, nove poruke zahtijevaju Vašu pažnju."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,help:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction
 msgid "If checked, new messages require your attention."
 msgstr "Ako je označeno, nove poruke zahtijevaju vašu pažnju."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
 msgid ""
 "If checked, the partners will receive an email warning they have been added "
 "in the document's followers."
@@ -2358,16 +2248,16 @@ msgstr ""
 "sljedbenike dokumenta."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,help:mail.field_mail_template_user_signature
+#: model:ir.model.fields,help:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,help:mail.field_mail_template__user_signature
 msgid ""
 "If checked, the user's signature will be appended to the text version of the"
 " message"
 msgstr "Ako je odabrano, potpis korisnika biti će dodan tekst verziji poruke."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_opt_out
-#: model:ir.model.fields,help:mail.field_res_users_opt_out
+#: model:ir.model.fields,help:mail.field_res_partner__opt_out
+#: model:ir.model.fields,help:mail.field_res_users__opt_out
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails for mass "
 "mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
@@ -2379,7 +2269,7 @@ msgstr ""
 "partnere."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_mail__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible."
@@ -2388,8 +2278,8 @@ msgstr ""
 " nije postavljeno, e-mail će biti poslan što prije moguće."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_scheduled_date
-#: model:ir.model.fields,help:mail.field_mail_template_scheduled_date
+#: model:ir.model.fields,help:mail.field_email_template_preview__scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_template__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible. Jinja2 placeholders may be used."
@@ -2399,7 +2289,7 @@ msgstr ""
 "tekst se može koristiti."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
 msgid ""
 "If you have setup a catch-all email domain redirected to the Odoo server, "
 "enter the domain name here."
@@ -2408,26 +2298,26 @@ msgstr ""
 "unesite naziv domene ovdje."
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:141
+#: code:addons/mail/models/mail_alias.py:130
 #, python-format
 msgid "Inactive Alias"
 msgstr "Neaktivni alias"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:655
-#: code:addons/mail/static/src/xml/client_action.xml:22
-#: code:addons/mail/static/src/xml/client_action.xml:154
-#: code:addons/mail/static/src/xml/client_action.xml:164
+#: code:addons/mail/static/src/js/services/chat_manager.js:84
+#: code:addons/mail/static/src/xml/discuss.xml:22
+#: code:addons/mail/static/src/xml/discuss.xml:154
+#: code:addons/mail/static/src/xml/discuss.xml:164
 #, python-format
 msgid "Inbox"
 msgstr "Pristigla pošta"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,help:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,help:mail.field_mail_message_parent_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,help:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,help:mail.field_mail_message__parent_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__parent_id
 msgid "Initial thread message."
 msgstr "Inicijalna nit poruke"
 
@@ -2438,12 +2328,12 @@ msgid "Integrations"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__internal
 msgid "Internal Only"
 msgstr "Samo interno"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:99
+#: code:addons/mail/models/mail_alias.py:88
 #, python-format
 msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
@@ -2453,7 +2343,8 @@ msgstr ""
 "'Vrijednost'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1794
+#: code:addons/mail/models/mail_thread.py:1811
+#: code:addons/mail/models/mail_thread.py:1996
 #, python-format
 msgid ""
 "Invalid record set: should be called as model (without records) or on "
@@ -2463,14 +2354,14 @@ msgstr ""
 " jednom zapisu"
 
 #. module: mail
-#: code:addons/mail/controllers/main.py:41
+#: code:addons/mail/controllers/main.py:40
 #, python-format
 msgid "Invalid token in route %s"
 msgstr "Netočan token u smjeru %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "Invitation"
 msgstr "Poziv"
@@ -2483,8 +2374,8 @@ msgstr "Poziv za praćenje %s: %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:44
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:44
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite"
 msgstr "Pozovi"
@@ -2498,15 +2389,15 @@ msgstr "Pozovi pratitelja"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:31
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:29
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite people"
 msgstr "Pozovi osobe"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:867
+#: code:addons/mail/static/src/js/discuss.js:882
 #, python-format
 msgid "Invite people to #%s"
 msgstr "Pozovite ljude na #%s"
@@ -2522,95 +2413,96 @@ msgid "Invited people only"
 msgstr "Samo pozvani"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_note_note_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_product_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_template_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_project_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_task_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_users_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_note_note__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_product__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_template__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_project__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_task__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_users__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_is_follower
 msgid "Is Follower"
 msgstr "Je pratitelj"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification
+#: model:ir.model.fields,field_description:mail.field_mail_mail__notification
 msgid "Is Notification"
 msgstr "Je obavijest"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_read
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_read
 msgid "Is Read"
 msgstr "Pročitano"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_subscribed
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_subscribed
 msgid "Is Subscribed"
 msgstr "Je pretplaćen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_member
 msgid "Is a member"
 msgstr "Je član"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
 msgid "Is pinned on the interface"
 msgstr "Je prikvačeno na sučelje"
 
@@ -2625,144 +2517,76 @@ msgid "Join a group"
 msgstr "Priključi se grupi"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_lang
-#: model:ir.model.fields,field_description:mail.field_mail_template_lang
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__lang
+#: model:ir.model.fields,field_description:mail.field_mail_template__lang
 msgid "Language"
 msgstr "Jezik"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_track_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_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_test_simple_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_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
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,field_description:mail.field_note_note_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_product_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_template_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_project_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_task_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_users_message_last_post
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_last_post
-msgid "Last Message Date"
-msgstr "Datum zadnje poruke"
-
-#. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner___last_update
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message___last_update
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract___last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message____last_update
+#: 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_subtype____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_notification____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_template____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_thread____last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract____last_update
 msgid "Last Modified on"
 msgstr "Zadnja promjena"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_last_seen_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_seen_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_last_seen_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__seen_message_id
 msgid "Last Seen"
 msgstr "Zadnje viđeno"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_uid
-#: 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_tracking_value_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_uid
 msgid "Last Updated by"
 msgstr "Promijenio"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_date
-#: 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_tracking_value_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_date
 msgid "Last Updated on"
 msgstr "Vrijeme promjene"
 
@@ -2786,37 +2610,37 @@ msgstr "Odsustvo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:687
-#: code:addons/mail/static/src/xml/client_action.xml:112
+#: code:addons/mail/models/mail_channel.py:693
+#: code:addons/mail/static/src/xml/discuss.xml:112
 #, python-format
 msgid "Leave this channel"
 msgstr "Napusti ovaj kanal"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_channel_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__channel_ids
 msgid ""
 "List of channels that will be added as listeners of the current document."
 msgstr "Popis kanala koji će se dodati kao slušatelji trenutnog dokumenta."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__partner_ids
 msgid ""
 "List of partners that will be added as follower of the current document."
 msgstr "Popis partnera koji će se dodati kao pratitelji trenutnog dokumenta."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:698
+#: code:addons/mail/models/mail_channel.py:704
 #, python-format
 msgid "List users in the current channel"
 msgstr "Popis korisnika na trenutnom kanalu"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__channel_id
 msgid "Listener"
 msgstr "Slušalac"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_partner_ids
 msgid "Listeners"
 msgstr "Slušatelji"
 
@@ -2832,7 +2656,7 @@ msgstr "Livechat razgovor"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:31
+#: code:addons/mail/static/src/js/chatter_composer.js:30
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Log"
@@ -2856,8 +2680,8 @@ msgid "Log an Activity"
 msgstr "Zabilježi aktivnost"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__is_log
 msgid "Log an Internal Note"
 msgstr "Prijavi internu bilješku"
 
@@ -2876,10 +2700,10 @@ msgid "Log or schedule an activity"
 msgstr ""
 
 #. 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
+#: 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 ""
 
@@ -2889,13 +2713,13 @@ msgid "Mail Channel Form"
 msgstr "Obrazac mail kanala"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:369
+#: code:addons/mail/models/mail_mail.py:367
 #, python-format
 msgid "Mail Delivery Failed"
 msgstr "Isporuka pošte nije uspjela"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,field_description:mail.field_ir_model__is_mail_thread
 #: model:ir.ui.view,arch_db:mail.model_search_view
 msgid "Mail Thread"
 msgstr "Rasprava e-pošte"
@@ -2906,7 +2730,7 @@ msgid "Mail Tracking Value"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_notification
+#: model:ir.model.fields,help:mail.field_mail_mail__notification
 msgid "Mail has been created to notify people of an existing mail.message"
 msgstr "Mail je kreiran za obavještavanje ljudi za postojeću mail.poruku"
 
@@ -2918,7 +2742,7 @@ msgid "Mail: Email Queue Manager"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:832
+#: code:addons/mail/models/mail_thread.py:813
 #, python-format
 msgid "Mailbox unavailable - %s"
 msgstr ""
@@ -2937,14 +2761,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all as read"
 msgstr "Označi sve kao pročitano"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all read"
 msgstr "Označi sve pročitane"
@@ -2956,15 +2780,15 @@ msgstr "Označi kao izvršeno"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:206
+#: code:addons/mail/static/src/xml/thread.xml:211
 #, python-format
 msgid "Mark as Read"
 msgstr "Označi kao pročitano"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:153
-#: code:addons/mail/static/src/xml/thread.xml:200
+#: code:addons/mail/static/src/xml/thread.xml:158
+#: code:addons/mail/static/src/xml/thread.xml:205
 #, python-format
 msgid "Mark as Todo"
 msgstr "Označi sa 'Za obaviti'"
@@ -2977,12 +2801,12 @@ msgid "Mark as done"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_medium
 msgid "Medium-sized photo"
 msgstr "Fotografija srednje veličine"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,help:mail.field_mail_channel__image_medium
 msgid ""
 "Medium-sized photo of the group. It is automatically resized as a 128x128px "
 "image, with aspect ratio preserved. Use this field in form views or some "
@@ -3004,7 +2828,7 @@ msgid "Members"
 msgstr "Članovi"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,help:mail.field_mail_channel__group_ids
 msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
@@ -3013,16 +2837,22 @@ msgstr ""
 "da će oni prema potrebi moći ručno upravljati svojom pretplatom."
 
 #. module: mail
+#: code:addons/mail/wizard/base_partner_merge.py:13
+#, python-format
+msgid "Merged with the following partners:"
+msgstr "Spojeno sa sljedećim partnerima:"
+
+#. 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.model.fields,field_description:mail.field_mail_mail__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Message"
 msgstr "Poruka"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
 msgid "Message ID"
 msgstr "ID poruke"
 
@@ -3032,37 +2862,37 @@ msgid "Message Notifications"
 msgstr "Obavjesti poruka"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_mail__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_message__record_name
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__record_name
 msgid "Message Record Name"
 msgstr "Naziv zapisa poruke"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__name
 msgid "Message Type"
 msgstr "Tip poruke"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_to
+#: model:ir.model.fields,help:mail.field_mail_mail__email_to
 msgid "Message recipients (emails)"
 msgstr "Primatelji poruke (e-maila)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_references
+#: model:ir.model.fields,help:mail.field_mail_mail__references
 msgid "Message references, such as identifiers of previous messages"
 msgstr "Reference poruke, poput identifikatora prethodnih poruka"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
+#: code:addons/mail/static/src/xml/discuss.xml:124
 #, python-format
 msgid "Message sent in \""
 msgstr "Poruka poslana u \""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__name
 msgid ""
 "Message subtype gives a more precise type on the message, especially for "
 "system notifications. For example, it can be a notification related to a new"
@@ -3081,7 +2911,7 @@ msgid "Message subtypes"
 msgstr "Podtipovi poruka"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_followers_subtype_ids
+#: model:ir.model.fields,help:mail.field_mail_followers__subtype_ids
 msgid ""
 "Message subtypes followed, meaning subtypes that will be pushed onto the "
 "user's Wall."
@@ -3090,10 +2920,10 @@ msgstr ""
 "zidu korisnika."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,help:mail.field_mail_mail_message_type
-#: model:ir.model.fields,help:mail.field_mail_message_message_type
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,help:mail.field_mail_mail__message_type
+#: model:ir.model.fields,help:mail.field_mail_message__message_type
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_type
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
@@ -3102,87 +2932,88 @@ msgstr ""
 "komentari za druge poruke poput korisničkih odgovora"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,help:mail.field_mail_mail_message_id
-#: model:ir.model.fields,help:mail.field_mail_message_message_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,help:mail.field_mail_mail__message_id
+#: model:ir.model.fields,help:mail.field_mail_message__message_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_id
 msgid "Message unique identifier"
 msgstr "Jedinstveni indentifikator poruke"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_id
 msgid "Message-Id"
 msgstr "Id-poruke"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_ids
 #: model:ir.ui.menu,name:mail.menu_mail_message
 #: model:ir.ui.view,arch_db:mail.view_message_tree
 msgid "Messages"
@@ -3203,7 +3034,7 @@ msgstr ""
 "kasnije ponovno pregledate."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__internal
 msgid ""
 "Messages with internal subtypes will be visible only by employees, aka "
 "members of base_user group"
@@ -3212,20 +3043,20 @@ msgstr ""
 "članovima base_user group"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_res_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_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
 msgid "Model"
 msgstr "Model"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_res_model
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__res_model
 msgid "Model of the followed resource"
 msgstr "Model pratećeg resursa"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__res_model
 msgid ""
 "Model the subtype applies to. If False, this subtype applies to all models."
 msgstr ""
@@ -3254,25 +3085,25 @@ msgid "My Activities"
 msgstr "Moje aktivnosti"
 
 #. 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_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.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Name"
 msgstr "Naziv"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_record_name
-#: model:ir.model.fields,help:mail.field_mail_mail_record_name
-#: model:ir.model.fields,help:mail.field_mail_message_record_name
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,help:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,help:mail.field_mail_mail__record_name
+#: model:ir.model.fields,help:mail.field_mail_message__record_name
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__record_name
 msgid "Name get of the related document."
 msgstr "Ime prezueto iz povezanog dokumenta"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,help:mail.field_mail_template_report_name
+#: model:ir.model.fields,help:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,help:mail.field_mail_template__report_name
 msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
@@ -3281,71 +3112,71 @@ msgstr ""
 "Proširenje se može izostaviti i u tom će slučaju doći iz tipa izvješća. "
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_mail_needaction
-#: model:ir.model.fields,help:mail.field_mail_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_mail__needaction
+#: model:ir.model.fields,help:mail.field_mail_message__needaction
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__needaction
 #: model:ir.ui.view,arch_db:mail.view_message_search
 msgid "Need Action"
 msgstr "Potrebna akcija"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_res_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
 msgid "Needaction Recipient"
 msgstr "Primatelj potrebne akcije"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:138
+#: code:addons/mail/static/src/xml/discuss.xml:138
 #, python-format
 msgid "New Channel"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:137
+#: code:addons/mail/static/src/xml/discuss.xml:137
 #, python-format
 msgid "New Message"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_char
 msgid "New Value Char"
 msgstr "Nova vrijednost Char"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_datetime
 msgid "New Value Datetime"
 msgstr "Nova vrijednost Datetime"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_float
 msgid "New Value Float"
 msgstr "Nova vrijednost Float"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_integer
 msgid "New Value Integer"
 msgstr "Nova vrijednost Integer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_monetary
 msgid "New Value Monetary"
 msgstr "Nova monetarna vrijednost"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_text
 msgid "New Value Text"
 msgstr "Tekst nove vrijednosti: "
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:55
-#: code:addons/mail/static/src/js/window_manager.js:139
+#: code:addons/mail/static/src/js/services/chat_manager.js:1625
+#: code:addons/mail/static/src/js/services/chat_window_manager.js:283
 #: code:addons/mail/static/src/xml/systray.xml:12
 #: code:addons/mail/static/src/xml/systray.xml:21
 #, python-format
@@ -3354,21 +3185,21 @@ msgstr "Nova poruka"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:233
+#: code:addons/mail/static/src/xml/thread.xml:238
 #, python-format
 msgid "New messages"
 msgstr "Nove poruke"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:110
+#: code:addons/mail/static/src/xml/thread.xml:115
 #, python-format
 msgid "New messages appear here."
 msgstr "Nove poruke se pojavljuju ovdje."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:97
+#: code:addons/mail/static/src/js/discuss.js:99
 #, python-format
 msgid "New people"
 msgstr "Nove osobe"
@@ -3379,85 +3210,85 @@ msgid "Next Activities"
 msgstr "Sljedeće aktivnosti"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_date_deadline
 msgid "Next Activity Deadline"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_summary
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_summary
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_summary
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_summary
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_summary
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_summary
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_summary
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_summary
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_summary
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_summary
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_summary
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_summary
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_summary
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_summary
 msgid "Next Activity Summary"
 msgstr "Sažetak sljedeće aktivnosti"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_type_id
 msgid "Next Activity Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,field_description:mail.field_mail_activity__has_recommended_activities
 msgid "Next activities available"
 msgstr ""
 
@@ -3501,28 +3332,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:113
+#: code:addons/mail/static/src/xml/thread.xml:118
 #, python-format
 msgid "No starred message"
 msgstr "Nema poruka označenih zvjezdicom"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__no_auto_thread
 msgid "No threading for answers"
 msgstr "Bez niza mailova pri odgovoru"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_note
+#: model:ir.model.fields,field_description:mail.field_mail_activity__note
 #: model:mail.message.subtype,name:mail.mt_note
 msgid "Note"
 msgstr "Bilješka"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:157
+#: code:addons/mail/static/src/xml/thread.xml:162
 #, python-format
 msgid "Note by"
 msgstr "Bilješka od"
@@ -3533,249 +3364,254 @@ msgid "Notification"
 msgstr "Obavijest"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_users_notification_type
+#: model:ir.model.fields,field_description:mail.field_res_users__notification_type
 msgid "Notification Management"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_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 "Obavijesti"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers"
 msgstr "Obavijesti sljedbenike"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_notify
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_notify
+#: model:ir.model.fields,help:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers of the document (mass post only)"
 msgstr "Obavijesti pratitelje dokumenta (samo masovna pošta)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of Actions"
 msgstr "Broj akcija"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_days
+#: 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_payment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of messages which requires an action"
 msgstr "Broj poruka koje zahtijevaju aktivnost"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread_counter
 msgid "Number of unread messages"
 msgstr "Broj nepročitanih poruka"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model:ir.ui.view,arch_db:mail.message_notification_email
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Odoo"
 msgstr "Odoo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:895
+#: code:addons/mail/static/src/js/discuss.js:910
 #, python-format
 msgid ""
 "Odoo has now the permission to send you native notifications on this device."
@@ -3783,14 +3619,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "Odoo needs your permission to"
 msgstr "Odoo treba Vašu dozvolu za"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:892
+#: code:addons/mail/static/src/js/discuss.js:907
 #, python-format
 msgid ""
 "Odoo will not have the permission to send native notifications on this "
@@ -3799,38 +3635,38 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:120
+#: code:addons/mail/static/src/xml/discuss.xml:120
 #, python-format
 msgid "Offline"
 msgstr "Odspojen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_char
 msgid "Old Value Char"
 msgstr "Stara vrijednost Char"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_datetime
 msgid "Old Value DateTime"
 msgstr "Stara vrijednost DateTime"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_float
 msgid "Old Value Float"
 msgstr "Stara vrijednost Float"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_integer
 msgid "Old Value Integer"
 msgstr "Stara vrijednost Integer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_monetary
 msgid "Old Value Monetary"
 msgstr "Stara monetarna vrijednost"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_text
 msgid "Old Value Text"
 msgstr "Tekst stare vrijednosti"
 
@@ -3859,14 +3695,14 @@ msgstr "Jedan pratitelj"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:118
-#: code:addons/mail/static/src/xml/client_action.xml:202
+#: code:addons/mail/static/src/xml/discuss.xml:118
+#: code:addons/mail/static/src/xml/discuss.xml:202
 #, python-format
 msgid "Online"
 msgstr "Online"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:22
+#: code:addons/mail/models/ir_model.py:28
 #, python-format
 msgid "Only custom models can be modified."
 msgstr ""
@@ -3888,14 +3724,14 @@ msgstr "Otvori nadređeni dokument"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Open channel settings"
 msgstr "Otvori postavke kanala"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:187
+#: code:addons/mail/static/src/xml/discuss.xml:187
 #, python-format
 msgid "Open chat"
 msgstr "Otvori chat"
@@ -3908,15 +3744,15 @@ 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
+#: 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"
 msgstr "Isključiti iz masove e-pošte"
 
 #. module: mail
-#: 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_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
 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 "
@@ -3927,8 +3763,8 @@ msgstr ""
 "stvaranje novih zapisa u potpunosti."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,help:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,help:mail.field_mail_template__mail_server_id
 msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
@@ -3937,14 +3773,14 @@ msgstr ""
 "sa najvišim prioritetom."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_template
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_template
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_template
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_template
 msgid "Optional report to print and attach"
 msgstr "Izborno izvješće za ispisati i pridodati"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_lang
-#: model:ir.model.fields,help:mail.field_mail_template_lang
+#: model:ir.model.fields,help:mail.field_email_template_preview__lang
+#: model:ir.model.fields,help:mail.field_mail_template__lang
 msgid ""
 "Optional translation language (ISO code) to select when sending out an "
 "email. If not set, the english version will be used. This should usually be "
@@ -3957,8 +3793,8 @@ msgstr ""
 "${object.partner_id.lang}."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,help:mail.field_mail_template_null_value
+#: model:ir.model.fields,help:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,help:mail.field_mail_template__null_value
 msgid "Optional value to use if the target field is empty"
 msgstr ""
 "Opcionalna vrijednost koja će se koristiti ako je ciljano polje prazno"
@@ -3974,8 +3810,8 @@ msgid "Outgoing"
 msgstr "Odlazno"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__mail_server_id
 msgid "Outgoing Mail Server"
 msgstr "Odlazni E-mail poslužitelj"
 
@@ -3985,10 +3821,10 @@ msgid "Outgoing Mails"
 msgstr "Odlazni mailovi"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_server_id
 msgid "Outgoing mail server"
 msgstr "Izlazni poslužitelj e-pošte"
 
@@ -4002,12 +3838,12 @@ msgstr "Izlazni poslužitelj e-pošte"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4021,43 +3857,43 @@ msgid "Override author's email"
 msgstr "Prijeđi autorov e-mail"
 
 #. module: mail
-#: 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_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
 msgid "Owner"
 msgstr "Vlasnik"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__parent_id
 msgid "Parent"
 msgstr "Nadređeni"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__parent_id
 msgid "Parent Message"
 msgstr "Nadređena poruka"
 
 #. module: mail
-#: 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_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
 msgid "Parent Model"
 msgstr "Ishodni Model"
 
 #. module: mail
-#: 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_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
 msgid "Parent Record Thread ID"
 msgstr "ID zapisa nadređenog"
 
 #. module: mail
-#: 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_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
 msgid ""
 "Parent model holding the alias. The model holding the alias reference is not"
 " necessarily the model given by alias_model_id (example: project "
@@ -4068,7 +3904,7 @@ msgstr ""
 "zadatka (model))"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__parent_id
 msgid ""
 "Parent subtype, used for automatic subscription. This field is not correctly"
 " named. For example on a project, the parent_id of project subtypes refers "
@@ -4097,42 +3933,42 @@ msgstr ""
 "e-mailova."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction_partner_ids
 msgid "Partners with Need Action"
 msgstr "Partneri s potrebnom akcijom"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_template__auto_delete
 msgid "Permanently delete this email after sending it, to save space"
 msgstr "Trajno obriši ovaj e-mail nakon slanja, radi uštede prostora"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:891
+#: code:addons/mail/static/src/js/discuss.js:906
 #, python-format
 msgid "Permission denied"
 msgstr "Dozvola odbijena"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:894
+#: code:addons/mail/static/src/js/discuss.js:909
 #, python-format
 msgid "Permission granted"
 msgstr "Dopuštenje odobreno"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image
 msgid "Photo"
 msgstr "Fotografija"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,field_description:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,field_description:mail.field_mail_template__copyvalue
 msgid "Placeholder Expression"
 msgstr "Rerzerviran izraz"
 
@@ -4146,12 +3982,12 @@ msgstr "Rerzerviran izraz"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4167,46 +4003,56 @@ msgid "Planned activities"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__days
+msgid "Planned in"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:282
+#: code:addons/mail/static/src/xml/thread.xml:287
 #, python-format
 msgid "Play this video"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:158
+#: code:addons/mail/static/src/js/chatter_composer.js:157
 #, python-format
 msgid "Please complete customer's informations"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:84
+#: code:addons/mail/static/src/js/many2many_tags_email.js:96
 #, python-format
 msgid "Please complete customer's informations and email"
 msgstr ""
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Please contact us instead using"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Please, wait while the file is uploading."
 msgstr "Molimo, pričekajte dok se datoteka ne učita"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_notification_type
+#: model:ir.model.fields,help:mail.field_res_users__notification_type
 msgid ""
 "Policy on how to handle Chatter notifications:\n"
-"- Emails: notifications are sent to your email\n"
-"- Odoo: notifications appear in your Odoo Inbox"
+"- Handle by Emails: notifications are sent to your email address\n"
+"- Handle in Odoo: notifications appear in your Odoo Inbox"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_alias_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_channel_alias_contact
-#: model:ir.model.fields,help:mail.field_res_users_alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_channel__alias_contact
+#: model:ir.model.fields,help:mail.field_res_users__alias_contact
 msgid ""
 "Policy to post a message on the document using the mailgateway.\n"
 "- everyone: everyone can post\n"
@@ -4219,12 +4065,13 @@ msgstr ""
 "- pratitelji: samo pratitelji srodne dokumentacije\n"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Powered by"
 msgstr "Podržano od "
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_previous_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__previous_type_ids
 msgid "Preceding Activities"
 msgstr "Prethodne aktivnosti"
 
@@ -4234,8 +4081,8 @@ msgid "Preferred reply address"
 msgstr "Željena adresa odgovora"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,help:mail.field_mail_template_reply_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,help:mail.field_mail_template__reply_to
 msgid "Preferred response address (placeholders may be used here)"
 msgstr "Preferirana adresa za odgovor"
 
@@ -4250,27 +4097,27 @@ msgid "Preview of"
 msgstr "Pregled"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_previous_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__previous_activity_type_id
 msgid "Previous Activity Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_public
+#: model:ir.model.fields,field_description:mail.field_mail_channel__public
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Privacy"
 msgstr "Privatnost"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:56
-#: code:addons/mail/static/src/xml/client_action.xml:176
+#: code:addons/mail/static/src/xml/discuss.xml:56
+#: code:addons/mail/static/src/xml/discuss.xml:176
 #, python-format
 msgid "Private Channels"
 msgstr "Privatni kanali"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:848
+#: code:addons/mail/static/src/js/discuss.js:863
 #, python-format
 msgid "Public Channels"
 msgstr "Javni kanali"
@@ -4299,68 +4146,72 @@ msgid "Received"
 msgstr "Primljeno"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_id
 msgid "Recipient"
 msgstr "Primatelj"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Recipients"
 msgstr "Primatelji"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_recommended_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__recommended_activity_type_id
 msgid "Recommended Activity Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_next_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__next_type_ids
 msgid "Recommended Next Activities"
 msgstr "Preporučene sljedeće aktivnosti"
 
 #. module: mail
-#: 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_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
 msgid "Record Thread ID"
 msgstr "ID niti zapisa"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_references
+#: model:ir.model.fields,field_description:mail.field_mail_mail__references
 msgid "References"
 msgstr "Reference"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_res_id
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Regards,"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__res_id
 msgid "Related Document ID"
 msgstr "Povezani ID dokumenta"
 
 #. 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_mail_model
-#: model:ir.model.fields,field_description:mail.field_mail_message_model
-#: model:ir.model.fields,field_description:mail.field_mail_template_model
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_model
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_model
+#: 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_compose_message__model
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_model
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__model
 msgid "Related Document Model"
 msgstr "Povezani model dokumenta"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_model
 msgid "Related Document Model Name"
 msgstr ""
 
@@ -4370,12 +4221,12 @@ msgid "Related Message"
 msgstr "Povezana poruka"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__partner_id
 msgid "Related Partner"
 msgstr "Povezani partner"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__relation_field
 msgid "Relation field"
 msgstr "Relacijsko polje"
 
@@ -4394,63 +4245,63 @@ msgstr "Ukloni sljedbenika"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:203
+#: code:addons/mail/static/src/xml/thread.xml:208
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Reply"
 msgstr "Odgovori"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,help:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,help:mail.field_mail_message_reply_to
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,help:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,help:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,help:mail.field_mail_message__reply_to
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__reply_to
 msgid ""
 "Reply email address. Setting the reply_to bypasses the automatic thread "
 "creation."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_reply_to
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__reply_to
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__reply_to
 msgid "Reply-To"
 msgstr "Odgovori na"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_name
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_name
 msgid "Report Filename"
 msgstr "Naziv datoteke izvještaja"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_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 "Odgovoran"
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_user_id
+msgid "Responsible User"
+msgstr "Odgovorna osoba"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
@@ -4459,12 +4310,12 @@ msgid "Retry"
 msgstr "Pokušaj ponovo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body_html
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body_html
 msgid "Rich-text Contents"
 msgstr "Formatirani tekst"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_body_html
+#: model:ir.model.fields,help:mail.field_mail_mail__body_html
 msgid "Rich-text/HTML message"
 msgstr "RT/HTML poruka"
 
@@ -4474,7 +4325,7 @@ msgid "SMTP Server"
 msgstr "SMTP poslužitelj"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_res_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__res_id
 msgid "Sample Document"
 msgstr "Primjer dokumenta"
 
@@ -4508,26 +4359,26 @@ msgid "Schedule activity"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:250
+#: code:addons/mail/models/mail_activity.py:260
 #, python-format
 msgid "Schedule an Activity"
 msgstr "Zakaži aktivnost"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:57
 #, 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
+#: 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"
 msgstr "Planirani datum"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__scheduled_date
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Scheduled Send Date"
 msgstr "Planirani datum slanja"
@@ -4543,8 +4394,8 @@ msgid "Search Groups"
 msgstr "Traži grupe"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__model_object_field
 msgid ""
 "Select target field from the related document model.\n"
 "If it is a relationship field you will be able to select a target field at the destination of the relationship."
@@ -4557,19 +4408,19 @@ msgstr "Odabrana grupa korisnika"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:374
+#: code:addons/mail/static/src/js/composer.js:428
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Send"
 msgstr "Pošalji"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail
 msgid "Send Email"
 msgstr "Pošalji e-mail"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:264
+#: code:addons/mail/models/mail_template.py:295
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Pošalji e-mail (%s)"
@@ -4595,13 +4446,13 @@ msgid "Send message"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
+#: model:ir.model.fields,field_description:mail.field_mail_channel__email_send
 msgid "Send messages by email"
 msgstr "Pošalji poruke e-mailom"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_from
-#: model:ir.model.fields,help:mail.field_mail_template_email_from
+#: model:ir.model.fields,help:mail.field_email_template_preview__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 "
 "value will be the author's email alias if configured, or email address."
@@ -4611,14 +4462,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Sending Error"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:108
+#: code:addons/mail/static/src/xml/discuss.xml:108
 #, python-format
 msgid "Sends messages by email"
 msgstr "Šalje poruke e-mailom"
@@ -4630,25 +4481,30 @@ msgid "Sent"
 msgstr "Poslano"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_email
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "Sent by"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_email
 msgid "Sent by Email"
 msgstr "Poslano e-mailom"
 
 #. 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
+#: 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 "Sekvenca"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Settings"
 msgstr "Postave"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__shortcode_type
 msgid "Shortcode Type"
 msgstr ""
 
@@ -4659,7 +4515,7 @@ msgid "Shortcodes"
 msgstr "Kratki kodovi"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__source
 msgid "Shortcut"
 msgstr "Prečac"
 
@@ -4670,20 +4526,20 @@ msgid "Show all records which has next action date is before today"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:667
+#: code:addons/mail/models/mail_channel.py:673
 #, python-format
 msgid "Show an helper message"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,field_description:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_mail_template__ref_ir_act_window
 msgid "Sidebar action"
 msgstr "Bočna akcija"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,help:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_mail_template__ref_ir_act_window
 msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
@@ -4692,10 +4548,10 @@ msgstr ""
 "modela dokumenta"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_avatar
 msgid ""
 "Small-sized image of this contact. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4706,12 +4562,12 @@ msgstr ""
 "mala slika."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_small
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_small
 msgid "Small-sized photo"
 msgstr "Fotografija malog formata"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_small
+#: model:ir.model.fields,help:mail.field_mail_channel__image_small
 msgid ""
 "Small-sized photo of the group. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4726,7 +4582,7 @@ msgid "Smiley"
 msgstr "Smiley"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_res_model_id
+#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_id
 msgid ""
 "Specify a model if the activity should be specific to a model and not "
 "available when managing activities for other models."
@@ -4734,74 +4590,52 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:661
-#: code:addons/mail/static/src/xml/client_action.xml:28
-#: code:addons/mail/static/src/xml/client_action.xml:156
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred
+#: code:addons/mail/static/src/js/services/chat_manager.js:89
+#: code:addons/mail/static/src/xml/discuss.xml:28
+#: code:addons/mail/static/src/xml/discuss.xml:156
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred
 #, python-format
 msgid "Starred"
 msgstr "Sa zvjezdicom"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_state
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_state
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_mail_activity__state
 msgid "State"
 msgstr "Stanje"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_state
+#: 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
 msgid "Status"
 msgstr "Status"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,help:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,help:mail.field_event_track_activity_state
-#: model:ir.model.fields,help:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,help:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,help:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,help:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,help:mail.field_product_template_activity_state
-#: model:ir.model.fields,help:mail.field_project_task_activity_state
-#: model:ir.model.fields,help:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,help:mail.field_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
+#: model:ir.model.fields,help:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,help:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,help:mail.field_event_track__activity_state
+#: model:ir.model.fields,help:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,help:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,help:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,help:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,help:mail.field_note_note__activity_state
+#: model:ir.model.fields,help:mail.field_product_product__activity_state
+#: model:ir.model.fields,help:mail.field_product_template__activity_state
+#: model:ir.model.fields,help:mail.field_project_task__activity_state
+#: model:ir.model.fields,help:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,help:mail.field_repair_order__activity_state
+#: model:ir.model.fields,help:mail.field_res_partner__activity_state
+#: model:ir.model.fields,help:mail.field_res_users__activity_state
+#: model:ir.model.fields,help:mail.field_sale_order__activity_state
+#: model:ir.model.fields,help:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,help:mail.field_survey_survey__activity_state
 msgid ""
 "Status based on activities\n"
 "Overdue: Due date is already passed\n"
@@ -4810,33 +4644,33 @@ msgid ""
 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
+#: 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"
 msgstr "Podređeno polje"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,field_description:mail.field_mail_template_sub_object
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,field_description:mail.field_mail_template__sub_object
 msgid "Sub-model"
 msgstr "Podređeni model"
 
 #. module: mail
 #. 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_mail_compose_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_mail_subject
-#: model:ir.model.fields,field_description:mail.field_mail_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_template_subject
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subject
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__subject
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_mail__subject
+#: model:ir.model.fields,field_description:mail.field_mail_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_template__subject
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subject
 #, python-format
 msgid "Subject"
 msgstr "Predmet"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_subject
-#: model:ir.model.fields,help:mail.field_mail_template_subject
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr "Naslov"
@@ -4848,22 +4682,22 @@ msgstr "Naslov..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:216
+#: code:addons/mail/static/src/xml/thread.xml:221
 #, python-format
 msgid "Subject:"
 msgstr "Predmet:"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_substitution
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__substitution
 msgid "Substitution"
 msgstr "Zamjena"
 
 #. module: mail
-#: 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_1993
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subtype_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subtype_id
 #: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
 msgid "Subtype"
 msgstr "Podvrsta"
@@ -4875,8 +4709,8 @@ msgid "Subtypes"
 msgstr "Podtipovi"
 
 #. 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
+#: 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 "Sažetak"
 
@@ -4888,7 +4722,7 @@ msgid "System notification"
 msgstr "Sistemska obavijest"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,help:mail.field_mail_activity__has_recommended_activities
 msgid "Technical field for UX purpose"
 msgstr ""
 
@@ -4898,6 +4732,14 @@ msgid "Template Preview"
 msgstr "Pregled predloška"
 
 #. module: mail
+#: code:addons/mail/models/mail_template.py:264
+#, python-format
+msgid ""
+"Template rendering failed, this could mean that your template contains "
+"python syntax errors"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_template_tree_all
 #: model:ir.ui.menu,name:mail.menu_email_templates
 #: model:ir.ui.view,arch_db:mail.email_template_form
@@ -4907,14 +4749,24 @@ msgid "Templates"
 msgstr "Predlošci"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The"
+msgstr "!"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The email sent to"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_shortcode__substitution
 msgid "The escaped html code replacing the shortcut"
 msgstr ""
 
 #. module: mail
-#: 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_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
 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 "
@@ -4925,9 +4777,9 @@ msgstr ""
 "zapisa ovog modela (npr. projektni zadatak)"
 
 #. module: mail
-#: 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_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
 msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
@@ -4936,9 +4788,9 @@ msgstr ""
 "za<jobs@example.odoo.com>"
 
 #. module: mail
-#: 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_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
 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 "
@@ -4951,9 +4803,9 @@ msgstr ""
 "pronađe sistemskog korisnika za tu adresu."
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:165
-#: code:addons/mail/models/mail_message.py:579
-#: code:addons/mail/models/mail_message.py:674
+#: code:addons/mail/models/mail_activity.py:175
+#: code:addons/mail/models/mail_message.py:578
+#: code:addons/mail/models/mail_message.py:678
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -4965,18 +4817,18 @@ msgstr ""
 "(Tip dokumenta: %s, operacija : %s)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__source
 msgid "The shortcut which must be replaced in the Chat Messages"
 msgstr "Prečac koji mora biti zamijenjen u chat porukama"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__unicode_source
 msgid "The source is replaced by this unicode character in the Chat Messages"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,help:mail.field_mail_template_model_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,help:mail.field_mail_template__model_id
 msgid "The type of document this template can be used with"
 msgstr "Tip dokumenta s kojim se može koristiti ovaj predložak"
 
@@ -4986,7 +4838,7 @@ msgid "This"
 msgstr "Ovaj"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image
+#: model:ir.model.fields,help:mail.field_mail_channel__image
 msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
@@ -4994,7 +4846,7 @@ msgstr ""
 "Ovo polje sadrži sliku koja se koristi za grupu, ograničeno na 1014x1024 px."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_public
+#: model:ir.model.fields,help:mail.field_mail_channel__public
 msgid ""
 "This group is visible by non members. Invisible groups can add members "
 "through the invite button."
@@ -5008,20 +4860,20 @@ msgid "Thread"
 msgstr "Nit"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_to
 msgid "To"
 msgstr "za"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_to
 msgid "To (Emails)"
 msgstr "Za (E-mail)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_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
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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)"
 msgstr "Za (Partneri)"
 
@@ -5036,8 +4888,8 @@ msgstr "Za:"
 #. module: mail
 #. openerp-web
 #: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:25
-#: code:addons/mail/static/src/js/thread.js:242
+#: code:addons/mail/static/src/js/activity.js:82
+#: code:addons/mail/static/src/js/thread.js:328
 #: code:addons/mail/static/src/xml/systray.xml:75
 #: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
 #: selection:hr.applicant,activity_state:0
@@ -5047,12 +4899,12 @@ msgstr "Za:"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -5074,7 +4926,7 @@ msgstr "Za obaviti"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:35
+#: code:addons/mail/static/src/js/activity.js:92
 #, python-format
 msgid "Tomorrow"
 msgstr "Sutra"
@@ -5085,10 +4937,10 @@ msgid "Topics discussed in this group..."
 msgstr "Teme raspravljane u grupi..."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid ""
 "Tracked values are stored in a separate model. This field allow to "
 "reconstruct the tracking and to generate statistics on the model."
@@ -5097,7 +4949,7 @@ msgstr ""
 "rekonstrukciju praćenja i generiranje statistika na modelu."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,field_description:mail.field_ir_model_fields__track_visibility
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Tracking"
 msgstr "Praćenje"
@@ -5115,28 +4967,28 @@ msgid "Tracking Values"
 msgstr "Vrijednost praćenja"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid "Tracking values"
 msgstr "Vrijednost praćenja"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_type
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_type
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_type
 msgid "Type"
 msgstr "Vrsta"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_uuid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__uuid
 msgid "UUID"
 msgstr "UUID"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:235
+#: code:addons/mail/models/mail_mail.py:233
 #, python-format
 msgid "Unable to connect to SMTP Server"
 msgstr ""
@@ -5150,7 +5002,6 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:700
 #: code:addons/mail/static/src/xml/followers.xml:22
 #, python-format
 msgid "Unfollow"
@@ -5164,143 +5015,145 @@ msgstr ""
 "Nažalost ovaj e-mail alias se već koristi, molimo odaberite jedinstveni"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__unicode_source
 msgid "Unicode Character"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread
 msgid "Unread Messages"
 msgstr "Nepročitane poruke"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread_counter
 msgid "Unread Messages Counter"
 msgstr "Brojač nepročitanih poruka"
 
@@ -5311,61 +5164,61 @@ msgstr "Nepročitane poruke"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all"
 msgstr "Ukloni zvjezdicu sa svih"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all messages"
 msgstr "Ukloni zvjezdicu sa svih poruka"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe"
 msgstr "Odjava"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe from channel"
 msgstr "Odjavi pretplatu s kanala"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:510
+#: code:addons/mail/models/mail_template.py:504
 #, python-format
 msgid "Unsupported report type %s found."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:322
+#: code:addons/mail/static/src/xml/thread.xml:327
 #, python-format
 msgid "Uploading"
 msgstr "Učitavanje"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Uploading error"
 msgstr "Greška pri preuzimanju"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_use_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_use_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__use_active_domain
 msgid "Use active domain"
 msgstr "Koristi aktivnu domenu"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_template_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_template_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__template_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__template_id
 msgid "Use template"
 msgstr "Koristi predložak"
 
@@ -5375,7 +5228,7 @@ msgid "Use your own email servers"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_sequence
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__sequence
 msgid "Used to order subtypes."
 msgstr "Koristi se za poredak podtipova."
 
@@ -5388,7 +5241,7 @@ msgstr "Korisnik"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:51
+#: code:addons/mail/static/src/xml/discuss.xml:51
 #: code:addons/mail/static/src/xml/extended_chat_window.xml:8
 #, python-format
 msgid "User name"
@@ -5400,7 +5253,7 @@ msgid "Users"
 msgstr "Korisnici"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:711
+#: code:addons/mail/models/mail_channel.py:717
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Korisnici na ovom kanalu: %s %s i Vi."
@@ -5414,14 +5267,14 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:670
+#: code:addons/mail/models/mail_thread.py:696
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 #, python-format
 msgid "View"
 msgstr "Pogled"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:668
+#: code:addons/mail/models/mail_thread.py:694
 #, python-format
 msgid "View %s"
 msgstr ""
@@ -5437,8 +5290,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_sub_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__sub_model_object_field
 msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
@@ -5447,8 +5300,8 @@ msgstr ""
 "ciljanog polja unutar odredišnog modela dokumenta (pod-model)."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,help:mail.field_mail_template_sub_object
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,help:mail.field_mail_template__sub_object
 msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
@@ -5457,19 +5310,19 @@ msgstr ""
 "dokumenta prema kojem ide veza."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,help:mail.field_ir_model_fields__track_visibility
 msgid ""
 "When set, every modification to this field will be tracked in the chatter."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_is_log
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_is_log
+#: model:ir.model.fields,help:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__is_log
 msgid "Whether the message is an internal note (comment mode only)"
 msgstr "Bilo da je poruka interna bilješka (samo u komentar načinu)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,help:mail.field_ir_model__is_mail_thread
 msgid "Whether this model supports messages and notifications."
 msgstr ""
 
@@ -5487,47 +5340,47 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:12
+#: code:addons/mail/static/src/xml/composer.xml:11
 #, python-format
-msgid "Write something..."
-msgstr "Napišite nešto..."
+msgid "Write Something..."
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:29
-#: code:addons/mail/static/src/js/thread.js:244
+#: code:addons/mail/static/src/js/activity.js:86
+#: code:addons/mail/static/src/js/thread.js:330
 #, python-format
 msgid "Yesterday"
 msgstr "Jučer"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:96
+#: code:addons/mail/static/src/js/discuss.js:98
 #, python-format
 msgid "You added <b>%s</b> to the conversation."
 msgstr "Dodali ste <b>%s</b> u razgovor."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:708
+#: code:addons/mail/models/mail_channel.py:714
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Sami ste na ovom kanalu."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:677
+#: code:addons/mail/models/mail_channel.py:683
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "Vi ste u privatnom razgovoru sa <b>@%s</b>."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:672
+#: code:addons/mail/models/mail_channel.py:678
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Vi ste u kanalu <b>#%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:114
+#: code:addons/mail/static/src/xml/thread.xml:119
 #, python-format
 msgid ""
 "You can mark any message as 'starred', and it shows up in this channel."
@@ -5536,7 +5389,7 @@ msgstr ""
 "kanalu."
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:54
+#: code:addons/mail/models/res_users.py:53
 #, python-format
 msgid ""
 "You cannot create a new user from here.\n"
@@ -5556,13 +5409,11 @@ msgstr ""
 "modulima."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:349
+#: code:addons/mail/models/mail_thread.py:342
 #, python-format
 msgid ""
-"You could also add a new %(document)s by sending an email to: "
-"%(email_link)s."
+"You could also add a new %(document)s by sending an email to %(email_link)s"
 msgstr ""
-"Također se može dodati novi %(document)s slanjem e-maila na: %(email_link)s."
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
@@ -5571,14 +5422,14 @@ msgstr "Dodijeljeno Vam je"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "You have been invited to: "
 msgstr "Pozvani ste da:"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,help:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_template__attachment_ids
 msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
@@ -5588,28 +5439,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:473
+#: code:addons/mail/static/src/js/services/chat_manager.js:1536
 #, python-format
 msgid "You unpinned your conversation with <b>%s</b>."
 msgstr "Otkačili ste Vaš razgovor s <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:471
+#: code:addons/mail/static/src/js/services/chat_manager.js:1534
 #, python-format
 msgid "You unsubscribed from <b>%s</b>."
 msgstr "Otkazali ste pretplatu na <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:217
+#: code:addons/mail/static/src/xml/discuss.xml:217
 #, python-format
 msgid "You:"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Your message has not been sent."
 msgstr ""
@@ -5621,23 +5472,35 @@ msgid "Your template should define email_from"
 msgstr "Predložak treba definirati email_from"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "alias %s: %s"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
+msgid "base.partner.merge.automatic.wizard"
+msgstr "base.partner.merge.automatic.wizard"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "by"
 msgstr "od"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid ""
+"cannot be processed. This address\n"
+"    is used to collect replies and should not be used to directly contact"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "kreirano"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:315
+#: code:addons/mail/models/mail_thread.py:309
 #, python-format
 msgid "document"
 msgstr "dokument"
@@ -5656,7 +5519,7 @@ msgstr "npr. Raspraviti o prijedlogu"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "enable desktop notifications"
 msgstr "Omogući obavjesti na računalu"
@@ -5691,13 +5554,13 @@ msgid "has been"
 msgstr "je bio"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:282
+#: code:addons/mail/models/mail_alias.py:271
 #, python-format
 msgid "incorrectly configured alias"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:278
+#: code:addons/mail/models/mail_alias.py:267
 #, python-format
 msgid "incorrectly configured alias (unknown reference record)"
 msgstr ""
@@ -5718,19 +5581,19 @@ msgid "mail.alias.mixin"
 msgstr "mail.alias.mixin"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:943
+#: code:addons/mail/models/mail_thread.py:925
 #, python-format
 msgid "model %s does not accept document creation"
 msgstr "model %s ne prihvaća kreiranje dokumenta"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:938
+#: code:addons/mail/models/mail_thread.py:920
 #, python-format
 msgid "model %s does not accept document update"
 msgstr "model %s ne prihvaća promjenu dokumenta"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:931
+#: code:addons/mail/models/mail_thread.py:913
 #, python-format
 msgid ""
 "model %s does not accept document update, fall back on document creation"
@@ -5756,14 +5619,14 @@ msgstr "sada"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:177
+#: code:addons/mail/static/src/xml/thread.xml:181
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "on"
 msgstr "na"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid ""
 "posting a message without model should be with a null res_id (private "
@@ -5771,7 +5634,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:917
+#: code:addons/mail/models/mail_thread.py:899
 #, python-format
 msgid ""
 "posting a message without model should be with a parent_id (private message)"
@@ -5802,13 +5665,13 @@ msgid "record:"
 msgstr "zapis:"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:935
+#: code:addons/mail/models/mail_thread.py:917
 #, python-format
 msgid "reply to missing document (%s,%s)"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:928
+#: code:addons/mail/models/mail_thread.py:910
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
 msgstr ""
@@ -5819,40 +5682,45 @@ msgid "res.config.settings"
 msgstr "res.config.settings"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid "resetting thread_id"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:254
+#: code:addons/mail/models/mail_channel.py:252
 #, python-format
 msgid "restricted to channel members"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:287
+#: code:addons/mail/models/mail_alias.py:276
 #, python-format
 msgid "restricted to followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:291
+#: code:addons/mail/models/mail_alias.py:280
 #, python-format
 msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:899
 #: code:addons/mail/models/mail_thread.py:917
-#: code:addons/mail/models/mail_thread.py:935
-#: code:addons/mail/models/mail_thread.py:938
-#: code:addons/mail/models/mail_thread.py:943
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:920
+#: code:addons/mail/models/mail_thread.py:925
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "skipping"
 msgstr "preskačem"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "team."
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:20
 #, python-format
@@ -5860,13 +5728,18 @@ msgid "this document"
 msgstr "ovaj dokument"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "unknown error"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:906
+#: code:addons/mail/models/mail_thread.py:888
 #, python-format
 msgid "unknown target model %s"
 msgstr "nepoznati odredišni model %s"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "using"
+msgstr ""
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
index 3570254ef0b..18ad2dd81ef 100644
--- a/addons/mail/i18n/hu.po
+++ b/addons/mail/i18n/hu.po
@@ -3,17 +3,17 @@
 # * mail
 # 
 # Translators:
-# krnkris <krnkris@freemail.hu>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# krnkris, 2016
+# Martin Trigaux, 2016
 # gezza <geza.nagy@oregional.hu>, 2016
 # Kisrobert <kisrobi@gmail.com>, 2016
 # Kovács Tibor <kovika@gmail.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.1\n"
+"Project-Id-Version: Odoo Server saas~11.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-13 14:36+0000\n"
-"PO-Revision-Date: 2017-12-13 14:36+0000\n"
+"POT-Creation-Date: 2018-03-22 14:10+0000\n"
+"PO-Revision-Date: 2018-03-22 14:10+0000\n"
 "Last-Translator: Kovács Tibor <kovika@gmail.com>, 2016\n"
 "Language-Team: Hungarian (https://www.transifex.com/odoo/teams/41243/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -23,168 +23,59 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_data_notification_email_default
-msgid ""
-"\n"
-"% set company = ctx.get('company', user.company_id)\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"
-"        <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-"        <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
-"    </div>\n"
-"</div>\n"
-"% endif\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('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('has_button_follow'):\n"
-"        % if ctx.get('has_button_access'):\n"
-"           |\n"
-"        % endif\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=\"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=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
-"        % endfor\n"
-"        % endif\n"
-"    </td>\n"
-"    <td valign=\"center\" align=\"right\">\n"
-"        <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\">\n"
-"    </td>\n"
-"</tr>\n"
-"<tr>\n"
-"    <td colspan=\"2\" style=\"text-align:center;\">\n"
-"        <hr width=\"100%\"\n"
-"            style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
-"        % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
-"        <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n"
-"            <strong>Internal communication</strong>: Replying will post an internal note. Followers won't receive any email notification.\n"
-"        </p>\n"
-"        % endif\n"
-"    </td>\n"
-"</tr>\n"
-"</tbody></table>\n"
-"</div>\n"
-"% endif\n"
-"<div>\n"
-"    ${object.body | safe}\n"
-"</div>\n"
-"% if ctx.get('tracking'):\n"
-"    <ul>\n"
-"    % for tracking in ctx['tracking']\n"
-"        <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
-"    % endfor\n"
-"    </ul>\n"
-"% endif\n"
-"\n"
-"% if ctx.get('signature'):\n"
-"    ${ctx['signature'] | safe}\n"
-"% endif\n"
-"<br/>\n"
-"<p style=\"color: #555555;\">\n"
-"    Sent by\n"
-"    % if ctx.get('website_url'):\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 target=\"_blank\" 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:674
+#: code:addons/mail/models/mail_channel.py:680
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr "Ez egy privát csatorna. Meghívottként csatlakozhat hozzá."
 
 #. 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) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-msgstr ""
-"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:63
+#: code:addons/mail/static/src/js/services/chat_manager.js:1634
 #, python-format
 msgid "%d Messages"
 msgstr "%d Üzenetek"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:31
+#: code:addons/mail/static/src/js/activity.js:88
 #, python-format
 msgid "%d days overdue"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:248
+#: code:addons/mail/models/mail_template.py:279
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (másolat)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:236
+#: code:addons/mail/models/mail_thread.py:234
 #, python-format
 msgid "%s created"
 msgstr "%s létrehozva"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:81
+#: code:addons/mail/models/res_users.py:80
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s csatlakozott a %s hálózathoz."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:211
 #, python-format
 msgid "&nbsp;("
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:179
+#: code:addons/mail/static/src/xml/thread.xml:184
 #, python-format
 msgid "(from"
 msgstr "(feladó"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,help:mail.field_mail_shortcode__shortcode_type
 msgid ""
 "* Smiley are only used for HTML code to display an image * Text (default "
 "value) is used to substitute text with another text"
@@ -201,7 +92,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:331
+#: code:addons/mail/static/src/xml/thread.xml:336
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr "-------- Régebbi üzenetek mutatása --------"
@@ -228,7 +119,7 @@ msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:684
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -244,7 +135,16 @@ msgstr ""
 "            Beilleszthet régebbi válaszokat az üzenetébe ide írva <b>:hivatkozas</b>.<br>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:584
+#: code:addons/mail/models/mail_channel.py:507
+#, python-format
+msgid ""
+"<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
+"href=\"#\" class=\"o_channel_redirect\" data-oe-"
+"id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:590
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -254,8 +154,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:508
-#: code:addons/mail/models/mail_channel.py:561
+#: code:addons/mail/models/mail_channel.py:514
+#: code:addons/mail/models/mail_channel.py:567
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -378,6 +278,11 @@ msgstr ""
 "                                    <span class=\"o_stat_text\">Összefüggő művelet</span>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+msgid "<span class=\"oe_inline\">days</span>"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>\n"
@@ -394,6 +299,13 @@ msgid "<strong> Feedback</strong>"
 msgstr ""
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid ""
+"<strong>Internal communication</strong>: Replying will post an internal "
+"note. Followers won't receive any email notification."
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>Only records checked in list view will be used.</strong><br/>\n"
@@ -406,9 +318,9 @@ msgid "<strong>Recommended Activities</strong>"
 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_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
 msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
@@ -431,115 +343,118 @@ msgid "Access Groups"
 msgstr "Csoportok hozzáférése"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction
 msgid "Action Needed"
 msgstr "Művelet szükséges"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__default
 msgid "Activated by default when subscribing."
 msgstr "Alapértelmezetten aktiválva lesz a feliratkozásnál."
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__active
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_search
 msgid "Active"
 msgstr "Aktív"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__active_domain
 msgid "Active domain"
 msgstr "Aktív domain név"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/systray.xml:87
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_ids
-#: model:ir.model.fields,field_description:mail.field_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.model.fields,field_description:mail.field_account_invoice__activity_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_ids
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
 #: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 #: model:mail.message.subtype,name:mail.mt_activities
@@ -551,7 +466,7 @@ msgstr "Tevékenységek"
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:60
 #: model:ir.model,name:mail.model_mail_activity
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_type_id
+#: 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
@@ -565,6 +480,32 @@ msgid "Activity Mixin"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_state
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_state
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_state
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_state
+msgid "Activity State"
+msgstr "Tevékenység állapota"
+
+#. 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"
@@ -586,7 +527,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:87
+#: code:addons/mail/static/src/xml/discuss.xml:87
 #, python-format
 msgid "Add"
 msgstr "Hozzáad"
@@ -594,7 +535,7 @@ msgstr "Hozzáad"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:64
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_channel_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__channel_ids
 #, python-format
 msgid "Add Channels"
 msgstr "Csatornák hozzáadása"
@@ -602,7 +543,7 @@ msgstr "Csatornák hozzáadása"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:61
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_partner_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
 msgid "Add Followers"
@@ -615,22 +556,28 @@ msgid "Add Followers can only be done on a mail thread model"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,field_description:mail.field_mail_template_user_signature
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,field_description:mail.field_mail_template__user_signature
 msgid "Add Signature"
 msgstr "Adjon hozzá aláírást"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:41
-#: code:addons/mail/static/src/xml/client_action.xml:186
+#: code:addons/mail/static/src/xml/discuss.xml:41
+#: code:addons/mail/static/src/xml/discuss.xml:186
 #, python-format
 msgid "Add a channel"
 msgstr "Egy csatorna hozzáadása"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:335
+#, python-format
+msgid "Add a new %(document)s or send an email to %(email_link)s"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:60
+#: code:addons/mail/static/src/xml/discuss.xml:60
 #, python-format
 msgid "Add a private channel"
 msgstr ""
@@ -647,7 +594,7 @@ msgid "Add contacts to notify..."
 msgstr "Értesíteni kívánt kapcsolatok hozzáadása..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
 msgid "Additional Contacts"
 msgstr "További kapcsolatok"
 
@@ -662,45 +609,45 @@ msgid "Advanced Settings"
 msgstr "Speciális beállítások"
 
 #. 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_res_users_alias_id
+#: 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_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
 msgid "Alias"
 msgstr "Álnév"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_contact
+#: 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
+#: model:ir.model.fields,field_description:mail.field_res_users__alias_contact
 msgid "Alias Contact Security"
 msgstr "Álnév kapcsolat biztonság"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__alias_domain
 msgid "Alias Domain"
 msgstr "Domain álnév"
 
 #. module: mail
-#: 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_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
 msgid "Alias Name"
 msgstr "Álnév elnevezése"
 
 #. module: mail
-#: 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_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
 msgid "Alias domain"
 msgstr "Álénév domain"
 
 #. module: mail
-#: 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_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
 msgid "Aliased Model"
 msgstr "Minta álnév"
 
@@ -725,16 +672,16 @@ msgstr "Mindig"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:198
+#: code:addons/mail/static/src/js/services/chat_manager.js:1328
 #, python-format
 msgid "Anonymous"
 msgstr "Névtelenül"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__no_auto_thread
 msgid ""
 "Answers do not go in the original document discussion thread. This has an "
 "impact on the generated message-id."
@@ -743,8 +690,8 @@ msgstr ""
 " Ez hatással van a létrehozott üzenet azonosító ID-vel."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_id
 msgid "Applies to"
 msgstr "Erre is vonatkozik"
 
@@ -756,9 +703,14 @@ msgid "Apply"
 msgstr "Alkalmaz"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+msgid "Archived"
+msgstr "Archivált"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:45
-#: model:ir.model.fields,field_description:mail.field_mail_activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
 #, python-format
 msgid "Assigned to"
 msgstr "Hozzárendelve"
@@ -769,19 +721,19 @@ msgid "Attach a file"
 msgstr "Csatolj egy fájlt"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_template__attachment_ids
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Attachments"
 msgstr "Mellékletek"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_message_attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_message__attachment_ids
 msgid ""
 "Attachments are linked to a document through model / res_id and to the "
 "message through this field."
@@ -800,10 +752,10 @@ msgid "Authenticated Partners"
 msgstr "Hitelesített ügyfelek"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_id
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Author"
 msgstr "Szerző"
@@ -814,10 +766,10 @@ msgid "Author Signature (mass mail only)"
 msgstr "Szerző aláírása (csak tömeges levelezéskor)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,help:mail.field_mail_mail_author_id
-#: model:ir.model.fields,help:mail.field_mail_message_author_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,help:mail.field_mail_mail__author_id
+#: model:ir.model.fields,help:mail.field_mail_message__author_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_id
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that"
 " did not match any partner."
@@ -826,27 +778,27 @@ msgstr ""
 "tartalmaz ami nem mutat egyik partnerre sem."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_avatar
 msgid "Author's avatar"
 msgstr "Szerző avatára"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_public_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_public_id
 msgid "Authorized Group"
 msgstr "Jogosult csoport"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_template__auto_delete
 msgid "Auto Delete"
 msgstr "Automatikus törlés"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_ids
 msgid "Auto Subscription"
 msgstr "Auto feliratkozás"
 
@@ -868,16 +820,16 @@ msgid "Be careful with channels following internal notifications"
 msgstr "Legyen elővigyázatos, belső értesítéseket követő csatornákkal"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
-#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
 msgid "Body"
 msgstr "Törzs"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,field_description:mail.field_res_users_message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_users__message_bounce
 msgid "Bounce"
 msgstr "Ugrálás"
 
@@ -923,32 +875,32 @@ msgid "Canned Response / Shortcode"
 msgstr "Bedobozolt válasz / Billentyűzet parancs"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_cc
+#: model:ir.model.fields,help:mail.field_mail_mail__email_cc
 msgid "Carbon copy message recipients"
 msgstr "Üzenet másolat címzettjei"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,help:mail.field_mail_template_email_cc
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,help:mail.field_mail_template__email_cc
 msgid "Carbon copy recipients (placeholders may be used here)"
 msgstr "Másolat címzettek (üres karaktereket is használhat)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,help:mail.field_mail_activity_type_category
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,help:mail.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__category
 msgid "Category"
 msgstr "Kategória"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_cc
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_cc
 msgid "Cc"
 msgstr "Másodpéldány"
 
@@ -958,40 +910,40 @@ msgid "Change"
 msgstr "Megváltoztatni"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field
 msgid "Changed Field"
 msgstr "Megváltozott mező"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
 #: selection:mail.channel,channel_type:0
 msgid "Channel"
 msgstr "Csatorna"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids
+#: 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_type
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_type
 msgid "Channel Type"
 msgstr "Csatorna típus"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:36
-#: code:addons/mail/static/src/xml/client_action.xml:172
+#: code:addons/mail/static/src/xml/discuss.xml:36
+#: code:addons/mail/static/src/xml/discuss.xml:172
 #: code:addons/mail/static/src/xml/systray.xml:19
 #: code:addons/mail/static/src/xml/systray.xml:36
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__channel_ids
 #: model:ir.ui.menu,name:mail.mail_channel_menu_settings
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
 #, python-format
@@ -1006,7 +958,7 @@ msgstr "Csatornák/Partner"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:168
+#: code:addons/mail/static/src/xml/discuss.xml:168
 #: code:addons/mail/static/src/xml/systray.xml:18
 #: code:addons/mail/static/src/xml/systray.xml:32
 #: model:ir.actions.client,name:mail.mail_channel_action_client_chat
@@ -1025,10 +977,10 @@ msgid "Chat Shortcode"
 msgstr "Társalgás billentyű parancs"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__child_ids
 msgid "Child Messages"
 msgstr "Alcsoportba rakott üzenetek"
 
@@ -1038,25 +990,6 @@ msgid "Choose an example"
 msgstr "Válasszon egy példát"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:342
-#, python-format
-msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
-msgstr ""
-"Kattintson ide egy új %(document)s vagy küldjön egy email-t ide: "
-"%(email_link)s"
-
-#. module: mail
-#: code:addons/mail/models/mail_thread.py:358
-#, python-format
-msgid "Click here to add new %s"
-msgstr "Kattintson ide egy új %s hozzáadáshoz"
-
-#. module: mail
-#: model:ir.actions.act_window,help:mail.mail_shortcode_action
-msgid "Click to define a new chat shortcode."
-msgstr "Kattintson egy új társalgás billentyű parancs meghatározásához."
-
-#. module: mail
 #: selection:mail.channel.partner,fold_state:0
 msgid "Closed"
 msgstr "Lezárt"
@@ -1072,8 +1005,8 @@ msgid "Comma-separated ids of recipient partners"
 msgstr "Vesszővel elválasztott címzett partnerek azonosítói (ID)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_partner_to
-#: model:ir.model.fields,help:mail.field_mail_template_partner_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr ""
@@ -1086,8 +1019,8 @@ msgid "Comma-separated recipient addresses"
 msgstr "Vesszővel elválasztott címzett címek"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,help:mail.field_mail_template_email_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,help:mail.field_mail_template__email_to
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr ""
 "Vesszővel elválasztott címzettek címei (üres karaktereket is használhat)"
@@ -1107,8 +1040,8 @@ msgid "Compose Email"
 msgstr "Email írás"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_composition_mode
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__composition_mode
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__composition_mode
 msgid "Composition mode"
 msgstr "Összeállítási mód"
 
@@ -1119,14 +1052,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:109
+#: code:addons/mail/static/src/xml/thread.xml:114
 #, python-format
 msgid "Congratulations, your inbox is empty"
 msgstr "Gratulálok, a postaládája üres"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:647
+#: code:addons/mail/static/src/js/discuss.js:662
 #, python-format
 msgid "Congratulations, your inbox is empty!"
 msgstr ""
@@ -1143,20 +1076,20 @@ msgid "Content"
 msgstr "Tartalom"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_body
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body
-#: model:ir.model.fields,field_description:mail.field_mail_message_body
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_body
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__body
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body
+#: model:ir.model.fields,field_description:mail.field_mail_message__body
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__body
 msgid "Contents"
 msgstr "Tartalmak"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_fold_state
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__fold_state
 msgid "Conversation Fold State"
 msgstr "Párbeszéd lapozási állapot"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_minimized
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_minimized
 msgid "Conversation is minimized"
 msgstr "Párbeszéd lecsökkentése"
 
@@ -1168,64 +1101,70 @@ msgid "Conversations"
 msgstr "Társalgások"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,help:mail.field_res_users_message_bounce
+#: model:ir.model.fields,help:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,help:mail.field_res_users__message_bounce
 msgid "Counter of the number of bounced emails for this contact"
 msgstr "Visszadobott levél számláló ehhez a kapcsolathoz."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:307
+#: code:addons/mail/static/src/js/discuss.js:318
 #, python-format
 msgid "Create %s"
 msgstr "Létrehoz %s"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__create_date
 msgid "Create Date"
 msgstr "Dátum létrehozás"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:350
+#, python-format
+msgid "Create a new %(document)s"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Created By"
 msgstr "Készítette"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_uid
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_uid
 msgid "Created by"
 msgstr "Készítette"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:41
-#: 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
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_date
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_date
 #, python-format
 msgid "Created on"
 msgstr "Létrehozás dátuma"
@@ -1236,92 +1175,24 @@ msgid "Creation Month"
 msgstr "Hónap létrehozás"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,help:mail.field_mail_mail_starred
-#: model:ir.model.fields,help:mail.field_mail_message_starred
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_starred
+#: model:ir.model.fields,help:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,help:mail.field_mail_mail__starred
+#: model:ir.model.fields,help:mail.field_mail_message__starred
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__starred
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "A jelenlegi felhasználónak van egy kicsillagozott értesítése mely hozzá van "
 "rendelve az üzenethez."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_date
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__date
+#: model:ir.model.fields,field_description:mail.field_mail_message__date
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__date
 msgid "Date"
 msgstr "Dátum"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,help:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,help:mail.field_event_event_message_last_post
-#: model:ir.model.fields,help:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,help:mail.field_event_track_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_track_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
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,help:mail.field_note_note_message_last_post
-#: model:ir.model.fields,help:mail.field_product_product_message_last_post
-#: model:ir.model.fields,help:mail.field_product_template_message_last_post
-#: model:ir.model.fields,help:mail.field_project_project_message_last_post
-#: model:ir.model.fields,help:mail.field_project_task_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,help:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,help:mail.field_res_users_message_last_post
-#: model:ir.model.fields,help:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,help:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr "A feljegyzésen történt utolsó levelezés dátuma."
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Deadline"
 msgstr "Határidő"
@@ -1332,32 +1203,32 @@ msgid "Dear"
 msgstr "Tisztelt"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__default
 msgid "Default"
 msgstr "Alapértelmezett"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,field_description:mail.field_mail_template_null_value
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,field_description:mail.field_mail_template__null_value
 msgid "Default Value"
 msgstr "Alapértelmezett érték"
 
 #. module: mail
-#: 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_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
 msgid "Default Values"
 msgstr "Alapértelmezett értékek"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__use_default_to
 msgid "Default recipients"
 msgstr "Alapértelmezett címzettek"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,help:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,help:mail.field_mail_template__use_default_to
 msgid ""
 "Default recipients of the record:\n"
 "- partner (using id on a partner or the partner_id field) OR\n"
@@ -1368,26 +1239,31 @@ msgstr ""
 "- email (email_from használatával vagy email mező)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.actions.act_window,help:mail.mail_shortcode_action
+msgid "Define a new chat shortcode"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete Emails"
 msgstr "E-mailek törlése"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete_message
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete_message
 msgid "Delete Message Copy"
 msgstr "Üzenet másolat törlése"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete sent emails (mass mailing only)"
 msgstr "Elküldött e-mailek törlése (kizárólag tömeges levélküldés)"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:320
+#: code:addons/mail/static/src/xml/thread.xml:325
 #, python-format
 msgid "Delete this attachment"
 msgstr "Törli ezt a mellékletet"
@@ -1398,15 +1274,15 @@ msgid "Delivery Failed"
 msgstr "Küldés sikertelen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_description
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_description
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_description
+#: model:ir.model.fields,field_description:mail.field_mail_channel__description
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__description
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__description
 #: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
 msgid "Description"
 msgstr "Leírás"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_description
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__description
 msgid ""
 "Description that will be added in the message posted for this subtype. If "
 "void, the name will be added instead."
@@ -1416,7 +1292,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:46
+#: code:addons/mail/static/src/xml/discuss.xml:46
 #, python-format
 msgid "Direct Messages"
 msgstr "Közvetlen üzenet"
@@ -1447,26 +1323,26 @@ msgid "Discussions"
 msgstr "Hozzászólások"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_display_name
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__display_name
+#: 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_subtype__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_notification__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_thread__display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__display_name
 msgid "Display Name"
 msgstr "Megjelenített név"
 
@@ -1480,13 +1356,13 @@ msgstr ""
 "összeállító varázslójának megnyitásához."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_res_name
+#: 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
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete_message
 msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
@@ -1500,7 +1376,12 @@ msgid "Document Followers"
 msgstr "Követők dokumentuma"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_name
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_model_id
+msgid "Document Model"
+msgstr "Dokumentum modell"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_name
 msgid "Document Name"
 msgstr ""
 
@@ -1521,28 +1402,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:296
+#: code:addons/mail/static/src/xml/thread.xml:301
 #, python-format
 msgid "Download this PDF"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:272
-#: code:addons/mail/static/src/xml/thread.xml:285
-#: code:addons/mail/static/src/xml/thread.xml:308
+#: code:addons/mail/static/src/xml/thread.xml:277
+#: code:addons/mail/static/src/xml/thread.xml:290
+#: code:addons/mail/static/src/xml/thread.xml:313
 #, python-format
 msgid "Download this attachment"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity__date_deadline
 msgid "Due Date"
 msgstr "Fizetési határidő"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:37
+#: code:addons/mail/static/src/js/activity.js:94
 #, python-format
 msgid "Due in %d days"
 msgstr ""
@@ -1574,7 +1455,7 @@ msgid "Edit subscription"
 msgstr "Feliratkozás szerkesztése"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_email
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_email
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 #: model:mail.activity.type,name:mail.mail_activity_data_email
 #: selection:mail.compose.message,message_type:0
@@ -1609,12 +1490,12 @@ msgid "Email Search"
 msgstr "E-mail keresésée"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_email_status
+#: model:ir.model.fields,field_description:mail.field_mail_notification__email_status
 msgid "Email Status"
 msgstr "Email állapot"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__template_id
 msgid "Email Template"
 msgstr "E-mail sablon"
 
@@ -1634,7 +1515,7 @@ msgid "Email Thread"
 msgstr "E-mail összafűzés"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_alias_id
+#: model:ir.model.fields,help:mail.field_res_users__alias_id
 msgid ""
 "Email address internally associated with this user. Incoming emails will "
 "appear in the user's notifications."
@@ -1643,10 +1524,10 @@ msgstr ""
 "megjelennek a felhasználó értesítéseinél."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_email_from
-#: model:ir.model.fields,help:mail.field_mail_mail_email_from
-#: model:ir.model.fields,help:mail.field_mail_message_email_from
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,help:mail.field_mail_compose_message__email_from
+#: model:ir.model.fields,help:mail.field_mail_mail__email_from
+#: model:ir.model.fields,help:mail.field_mail_message__email_from
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__email_from
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found and replaces the author_id field in the chatter."
@@ -1684,7 +1565,7 @@ msgid "Error during communication with the publisher warranty server."
 msgstr "Hiba a kiadó garancia szerverével történő kommunikációval."
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:302
+#: code:addons/mail/models/mail_mail.py:300
 #, python-format
 msgid ""
 "Error without exception. Probably due do sending an email without computed "
@@ -1726,7 +1607,7 @@ msgid "Extended Filters..."
 msgstr "Kiterjesztett szűrők..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_fail_counter
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__fail_counter
 msgid "Fail Mail"
 msgstr "Hibás levél"
 
@@ -1736,19 +1617,19 @@ msgid "Failed"
 msgstr "Sikertelen"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:374
+#: code:addons/mail/models/mail_template.py:368
 #, python-format
 msgid "Failed to render template %r using values %r"
 msgstr "Sablon  %r változtatás a %r érték használatával nem lett végrehajtva"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,field_description:mail.field_mail_mail__failure_reason
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Failure Reason"
 msgstr "Hiba oka"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
 msgid ""
 "Failure reason. This is usually the exception thrown by the email server, "
 "stored to ease the debugging of mailing issues."
@@ -1757,45 +1638,45 @@ msgstr ""
 "könnyebb levelezési ügyek, okok hibakereséshez"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred_partner_ids
 msgid "Favorited By"
 msgstr "Kedvencekként"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:215
-#: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
+#: code:addons/mail/static/src/js/activity.js:245
+#: model:ir.model.fields,field_description:mail.field_mail_activity__feedback
 #, python-format
 msgid "Feedback"
 msgstr "Visszajelzés"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_object_field
 msgid "Field"
 msgstr "Mező"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:24
+#: code:addons/mail/models/ir_model.py:30
 #, python-format
 msgid "Field \"Mail Thread\" cannot be changed to \"False\"."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_desc
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_desc
 msgid "Field Description"
 msgstr "Mező leírása"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_type
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_type
 msgid "Field Type"
 msgstr "Típus mező"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__relation_field
 msgid ""
 "Field used to link the related model to the subtype model when using "
 "automatic subscription on a related document. The field is used to compute "
@@ -1810,8 +1691,8 @@ msgid "Fields"
 msgstr "Mezők"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,help:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,help:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,help:mail.field_mail_template__copyvalue
 msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
@@ -1826,7 +1707,6 @@ msgstr "Behajtott"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:696
 #: code:addons/mail/static/src/xml/followers.xml:20
 #, python-format
 msgid "Follow"
@@ -1834,208 +1714,211 @@ msgstr "Követ"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_followers
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_follower_ids
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: model:ir.ui.view,arch_db:mail.view_followers_tree
 msgid "Followers"
 msgstr "Követők"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_channel_ids
 msgid "Followers (Channels)"
 msgstr "Követők (Csatornák)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_partner_ids
 msgid "Followers (Partners)"
 msgstr "Követők (Partnerek)"
 
@@ -2064,18 +1947,18 @@ msgid "Following"
 msgstr "Követés"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_icon
-#: model:ir.model.fields,help:mail.field_mail_activity_type_icon
+#: 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_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
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_from
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_from
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__email_from
 msgid "From"
 msgstr "Kezdő dátum"
 
@@ -2098,7 +1981,7 @@ msgid "Gateway"
 msgstr "Átjáró"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:55
+#: code:addons/mail/models/res_users.py:54
 #, python-format
 msgid "Go to the configuration panel"
 msgstr "Menjen a beállítások panelhez"
@@ -2141,49 +2024,54 @@ msgid "Has attachments"
 msgstr "Vannak mellékletei"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_headers
+#: model:ir.model.fields,field_description:mail.field_mail_mail__headers
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Headers"
 msgstr "Fejlécek"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_hidden
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Hello"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
 msgid "Hidden"
 msgstr "Rejtett"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_hidden
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__hidden
 msgid "Hide the subtype in the follower options"
 msgstr "Rejtse el a követők lehetőségeinek az altípusait"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_id
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__id
+#: 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_subtype__id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__id
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__id
+#: model:ir.model.fields,field_description:mail.field_mail_template__id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__id
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__id
 msgid "ID"
 msgstr "Azonosító ID"
 
 #. module: mail
-#: 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_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
 msgid ""
 "ID of the parent record holding the alias (example: project holding the task"
 " creation alias)"
@@ -2192,163 +2080,165 @@ msgstr ""
 "fogja a részfeladat létrehozó álnevet)"
 
 #. 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
+#: 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 "Ikon"
 
 #. 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
+#: 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"
 msgstr "A követett forrás ID azonosítója"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:119
-#: code:addons/mail/static/src/xml/client_action.xml:203
+#: code:addons/mail/static/src/xml/discuss.xml:119
+#: code:addons/mail/static/src/xml/discuss.xml:203
 #, python-format
 msgid "Idle"
 msgstr "Üresjárat"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,help:mail.field_event_event_message_unread
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread
-#: model:ir.model.fields,help:mail.field_event_track_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,help:mail.field_note_note_message_unread
-#: model:ir.model.fields,help:mail.field_product_product_message_unread
-#: model:ir.model.fields,help:mail.field_product_template_message_unread
-#: model:ir.model.fields,help:mail.field_project_project_message_unread
-#: model:ir.model.fields,help:mail.field_project_task_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread
-#: model:ir.model.fields,help:mail.field_res_users_message_unread
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,help:mail.field_event_event__message_unread
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread
+#: model:ir.model.fields,help:mail.field_event_track__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,help:mail.field_note_note__message_unread
+#: model:ir.model.fields,help:mail.field_product_product__message_unread
+#: model:ir.model.fields,help:mail.field_product_template__message_unread
+#: model:ir.model.fields,help:mail.field_project_project__message_unread
+#: model:ir.model.fields,help:mail.field_project_task__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread
+#: model:ir.model.fields,help:mail.field_res_users__message_unread
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread
 msgid "If checked new messages require your attention."
 msgstr "Ha be van jelölve, akkor figyelje az új üzeneteket."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,help:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction
 msgid "If checked, new messages require your attention."
 msgstr "Ha be van jelölve, akkor figyelje az új üzeneteket."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
 msgid ""
 "If checked, the partners will receive an email warning they have been added "
 "in the document's followers."
@@ -2357,8 +2247,8 @@ msgstr ""
 "adva a dokumentum követőihez."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,help:mail.field_mail_template_user_signature
+#: model:ir.model.fields,help:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,help:mail.field_mail_template__user_signature
 msgid ""
 "If checked, the user's signature will be appended to the text version of the"
 " message"
@@ -2367,8 +2257,8 @@ msgstr ""
 "szöveges változatához"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_opt_out
-#: model:ir.model.fields,help:mail.field_res_users_opt_out
+#: model:ir.model.fields,help:mail.field_res_partner__opt_out
+#: model:ir.model.fields,help:mail.field_res_users__opt_out
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails for mass "
 "mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
@@ -2380,7 +2270,7 @@ msgstr ""
 "részére a partnerek szűrését tömeges levelezések létrehozásánál."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_mail__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible."
@@ -2389,8 +2279,8 @@ msgstr ""
 " beállítva, az e-mail amilyen gyorsan csak lehet kiküldésre kerül."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_scheduled_date
-#: model:ir.model.fields,help:mail.field_mail_template_scheduled_date
+#: model:ir.model.fields,help:mail.field_email_template_preview__scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_template__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible. Jinja2 placeholders may be used."
@@ -2400,7 +2290,7 @@ msgstr ""
 "üres mező kitöltést használhat."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
 msgid ""
 "If you have setup a catch-all email domain redirected to the Odoo server, "
 "enter the domain name here."
@@ -2409,26 +2299,26 @@ msgstr ""
 "emailt megkap, akkor ide írja be ezt a domaint."
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:141
+#: code:addons/mail/models/mail_alias.py:130
 #, python-format
 msgid "Inactive Alias"
 msgstr "Nem aktív álnevek"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:655
-#: code:addons/mail/static/src/xml/client_action.xml:22
-#: code:addons/mail/static/src/xml/client_action.xml:154
-#: code:addons/mail/static/src/xml/client_action.xml:164
+#: code:addons/mail/static/src/js/services/chat_manager.js:84
+#: code:addons/mail/static/src/xml/discuss.xml:22
+#: code:addons/mail/static/src/xml/discuss.xml:154
+#: code:addons/mail/static/src/xml/discuss.xml:164
 #, python-format
 msgid "Inbox"
 msgstr "Beérkező levelek"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,help:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,help:mail.field_mail_message_parent_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,help:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,help:mail.field_mail_message__parent_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__parent_id
 msgid "Initial thread message."
 msgstr "Elsődleges összefűzött üzenet."
 
@@ -2439,12 +2329,12 @@ msgid "Integrations"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__internal
 msgid "Internal Only"
 msgstr "Csak belső"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:99
+#: code:addons/mail/models/mail_alias.py:88
 #, python-format
 msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
@@ -2454,7 +2344,8 @@ msgstr ""
 "\"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1794
+#: code:addons/mail/models/mail_thread.py:1811
+#: code:addons/mail/models/mail_thread.py:1996
 #, python-format
 msgid ""
 "Invalid record set: should be called as model (without records) or on "
@@ -2464,14 +2355,14 @@ msgstr ""
 "nélkül) vagy egyedi-feljegyzés feljegyzésbeállító"
 
 #. module: mail
-#: code:addons/mail/controllers/main.py:41
+#: code:addons/mail/controllers/main.py:40
 #, python-format
 msgid "Invalid token in route %s"
 msgstr "Érvénytelen token a hozzáférési útban %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "Invitation"
 msgstr "Meghívó"
@@ -2484,8 +2375,8 @@ msgstr "Meghívás a követésre %s: %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:44
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:44
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite"
 msgstr "Meghívás"
@@ -2499,15 +2390,15 @@ msgstr "Követő meghívása"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:31
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:29
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite people"
 msgstr "Személy meghívása"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:867
+#: code:addons/mail/static/src/js/discuss.js:882
 #, python-format
 msgid "Invite people to #%s"
 msgstr "Személy meghívása ide #%s"
@@ -2523,95 +2414,96 @@ msgid "Invited people only"
 msgstr "Csak személy meghívása"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_note_note_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_product_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_template_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_project_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_task_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_users_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_note_note__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_product__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_template__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_project__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_task__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_users__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_is_follower
 msgid "Is Follower"
 msgstr "Ő egy követő"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification
+#: model:ir.model.fields,field_description:mail.field_mail_mail__notification
 msgid "Is Notification"
 msgstr "Ez egy üzenet"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_read
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_read
 msgid "Is Read"
 msgstr "Elolvassa"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_subscribed
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_subscribed
 msgid "Is Subscribed"
 msgstr "Feliratkozott"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_member
 msgid "Is a member"
 msgstr "Ő tagja"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
 msgid "Is pinned on the interface"
 msgstr "Csatolón rögzítve"
 
@@ -2626,144 +2518,76 @@ msgid "Join a group"
 msgstr "Csoporthoz csatlakozás"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_lang
-#: model:ir.model.fields,field_description:mail.field_mail_template_lang
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__lang
+#: model:ir.model.fields,field_description:mail.field_mail_template__lang
 msgid "Language"
 msgstr "Nyelv"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_track_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_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_test_simple_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_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
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,field_description:mail.field_note_note_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_product_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_template_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_project_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_task_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_users_message_last_post
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_last_post
-msgid "Last Message Date"
-msgstr "Utolsó üzenet dátuma"
-
-#. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner___last_update
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message___last_update
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract___last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message____last_update
+#: 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_subtype____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_notification____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_template____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_thread____last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract____last_update
 msgid "Last Modified on"
 msgstr "Utoljára frissítve ekkor"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_last_seen_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_seen_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_last_seen_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__seen_message_id
 msgid "Last Seen"
 msgstr "Utolsó jelenlét"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_uid
-#: 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_tracking_value_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_uid
 msgid "Last Updated by"
 msgstr "Utoljára frissítette"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_date
-#: 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_tracking_value_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_date
 msgid "Last Updated on"
 msgstr "Utoljára frissítve "
 
@@ -2787,14 +2611,14 @@ msgstr "Távollét"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:687
-#: code:addons/mail/static/src/xml/client_action.xml:112
+#: code:addons/mail/models/mail_channel.py:693
+#: code:addons/mail/static/src/xml/discuss.xml:112
 #, python-format
 msgid "Leave this channel"
 msgstr "Ennek a csatornának az elhagyása"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_channel_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__channel_ids
 msgid ""
 "List of channels that will be added as listeners of the current document."
 msgstr ""
@@ -2802,7 +2626,7 @@ msgstr ""
 "hallgatóihoz."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__partner_ids
 msgid ""
 "List of partners that will be added as follower of the current document."
 msgstr ""
@@ -2810,18 +2634,18 @@ msgstr ""
 "követéséhez."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:698
+#: code:addons/mail/models/mail_channel.py:704
 #, python-format
 msgid "List users in the current channel"
 msgstr "A jelenlegi csatornát használók listázása"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__channel_id
 msgid "Listener"
 msgstr "Hallgató"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_partner_ids
 msgid "Listeners"
 msgstr "Hallgatók"
 
@@ -2837,7 +2661,7 @@ msgstr "Élő társalgás"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:31
+#: code:addons/mail/static/src/js/chatter_composer.js:30
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Log"
@@ -2861,8 +2685,8 @@ msgid "Log an Activity"
 msgstr "Naplózzon egy műveletet"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__is_log
 msgid "Log an Internal Note"
 msgstr "Egy Belső megjegyzés rögzítése"
 
@@ -2881,10 +2705,10 @@ msgid "Log or schedule an activity"
 msgstr ""
 
 #. 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
+#: 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 ""
 
@@ -2894,13 +2718,13 @@ msgid "Mail Channel Form"
 msgstr "Levelezési csatorna úrlap"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:369
+#: code:addons/mail/models/mail_mail.py:367
 #, python-format
 msgid "Mail Delivery Failed"
 msgstr "Levél elküldés sikertelen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,field_description:mail.field_ir_model__is_mail_thread
 #: model:ir.ui.view,arch_db:mail.model_search_view
 msgid "Mail Thread"
 msgstr ""
@@ -2911,7 +2735,7 @@ msgid "Mail Tracking Value"
 msgstr "Lavelezés követés értéke"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_notification
+#: model:ir.model.fields,help:mail.field_mail_mail__notification
 msgid "Mail has been created to notify people of an existing mail.message"
 msgstr ""
 "Levelet hozott létre az ügyfelek értesítésére ehhez a meglévő üzenethez "
@@ -2925,7 +2749,7 @@ msgid "Mail: Email Queue Manager"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:832
+#: code:addons/mail/models/mail_thread.py:813
 #, python-format
 msgid "Mailbox unavailable - %s"
 msgstr ""
@@ -2944,14 +2768,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all as read"
 msgstr "Összesetet jelölje elolvasottnak"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all read"
 msgstr "Összeset elolvasottnak jelöl"
@@ -2963,15 +2787,15 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:206
+#: code:addons/mail/static/src/xml/thread.xml:211
 #, python-format
 msgid "Mark as Read"
 msgstr "Elolvasottnak jelöl"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:153
-#: code:addons/mail/static/src/xml/thread.xml:200
+#: code:addons/mail/static/src/xml/thread.xml:158
+#: code:addons/mail/static/src/xml/thread.xml:205
 #, python-format
 msgid "Mark as Todo"
 msgstr "Feladatnak jelöl"
@@ -2984,12 +2808,12 @@ msgid "Mark as done"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_medium
 msgid "Medium-sized photo"
 msgstr "Közepes méretű fotó"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,help:mail.field_mail_channel__image_medium
 msgid ""
 "Medium-sized photo of the group. It is automatically resized as a 128x128px "
 "image, with aspect ratio preserved. Use this field in form views or some "
@@ -3011,7 +2835,7 @@ msgid "Members"
 msgstr "Tagok"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,help:mail.field_mail_channel__group_ids
 msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
@@ -3021,16 +2845,22 @@ msgstr ""
 "feliratkozásukat."
 
 #. module: mail
+#: code:addons/mail/wizard/base_partner_merge.py:13
+#, python-format
+msgid "Merged with the following partners:"
+msgstr "A következő partnerekkel összefésült:"
+
+#. 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.model.fields,field_description:mail.field_mail_mail__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Message"
 msgstr "Üzenet"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
 msgid "Message ID"
 msgstr "Üzenetazonosító ID"
 
@@ -3040,37 +2870,37 @@ msgid "Message Notifications"
 msgstr "Üzenet értesításek"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_mail__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_message__record_name
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__record_name
 msgid "Message Record Name"
 msgstr "Üzenet feljegyzési név"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__name
 msgid "Message Type"
 msgstr "Üzenettípus"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_to
+#: model:ir.model.fields,help:mail.field_mail_mail__email_to
 msgid "Message recipients (emails)"
 msgstr "Üzenet címzettek (emailek)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_references
+#: model:ir.model.fields,help:mail.field_mail_mail__references
 msgid "Message references, such as identifiers of previous messages"
 msgstr "Üzenet hivatkozások, mint előző üzenetek azonosítói"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
+#: code:addons/mail/static/src/xml/discuss.xml:124
 #, python-format
 msgid "Message sent in \""
 msgstr "Üzenet elküldve \""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__name
 msgid ""
 "Message subtype gives a more precise type on the message, especially for "
 "system notifications. For example, it can be a notification related to a new"
@@ -3090,7 +2920,7 @@ msgid "Message subtypes"
 msgstr "Üzenet altípusok"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_followers_subtype_ids
+#: model:ir.model.fields,help:mail.field_mail_followers__subtype_ids
 msgid ""
 "Message subtypes followed, meaning subtypes that will be pushed onto the "
 "user's Wall."
@@ -3099,10 +2929,10 @@ msgstr ""
 "felhasználó üzenőfalára."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,help:mail.field_mail_mail_message_type
-#: model:ir.model.fields,help:mail.field_mail_message_message_type
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,help:mail.field_mail_mail__message_type
+#: model:ir.model.fields,help:mail.field_mail_message__message_type
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_type
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
@@ -3111,87 +2941,88 @@ msgstr ""
 " hozzászólás egy másik üzenetre mint felhasználói válaszok"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,help:mail.field_mail_mail_message_id
-#: model:ir.model.fields,help:mail.field_mail_message_message_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,help:mail.field_mail_mail__message_id
+#: model:ir.model.fields,help:mail.field_mail_message__message_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_id
 msgid "Message unique identifier"
 msgstr "Üzenet egyedi azonosító"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_id
 msgid "Message-Id"
 msgstr "Üzenet-ID azonosító"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_ids
 #: model:ir.ui.menu,name:mail.menu_mail_message
 #: model:ir.ui.view,arch_db:mail.view_message_tree
 msgid "Messages"
@@ -3212,7 +3043,7 @@ msgstr ""
 "visszatekintésre."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__internal
 msgid ""
 "Messages with internal subtypes will be visible only by employees, aka "
 "members of base_user group"
@@ -3221,20 +3052,20 @@ msgstr ""
 "altípusokkal, ha a base_user group csoport részvevői is"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_res_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_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
 msgid "Model"
 msgstr "Modell"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_res_model
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__res_model
 msgid "Model of the followed resource"
 msgstr "A követett forrás modellje"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__res_model
 msgid ""
 "Model the subtype applies to. If False, this subtype applies to all models."
 msgstr ""
@@ -3263,25 +3094,25 @@ msgid "My Activities"
 msgstr "Tevékenységeim"
 
 #. 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_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.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Name"
 msgstr "Név"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_record_name
-#: model:ir.model.fields,help:mail.field_mail_mail_record_name
-#: model:ir.model.fields,help:mail.field_mail_message_record_name
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,help:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,help:mail.field_mail_mail__record_name
+#: model:ir.model.fields,help:mail.field_mail_message__record_name
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__record_name
 msgid "Name get of the related document."
 msgstr "A név az ide vonatkozó dokumentumról levéve."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,help:mail.field_mail_template_report_name
+#: model:ir.model.fields,help:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,help:mail.field_mail_template__report_name
 msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
@@ -3290,71 +3121,71 @@ msgstr ""
 "A kiterjesztés elhagyható, a jelentés típusából lesz létrehozva."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_mail_needaction
-#: model:ir.model.fields,help:mail.field_mail_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_mail__needaction
+#: model:ir.model.fields,help:mail.field_mail_message__needaction
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__needaction
 #: model:ir.ui.view,arch_db:mail.view_message_search
 msgid "Need Action"
 msgstr "Beavatkozás szükséges"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_res_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
 msgid "Needaction Recipient"
 msgstr "Címzett szükséges művelet "
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:138
+#: code:addons/mail/static/src/xml/discuss.xml:138
 #, python-format
 msgid "New Channel"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:137
+#: code:addons/mail/static/src/xml/discuss.xml:137
 #, python-format
 msgid "New Message"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_char
 msgid "New Value Char"
 msgstr "Új érték tábla"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_datetime
 msgid "New Value Datetime"
 msgstr "Dátumidő új érték "
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_float
 msgid "New Value Float"
 msgstr "Lebegőpontos új érték "
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_integer
 msgid "New Value Integer"
 msgstr "Egész szám új érték "
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_monetary
 msgid "New Value Monetary"
 msgstr "Pénzügyi új érték "
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_text
 msgid "New Value Text"
 msgstr "Szöveg új értéke"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:55
-#: code:addons/mail/static/src/js/window_manager.js:139
+#: code:addons/mail/static/src/js/services/chat_manager.js:1625
+#: code:addons/mail/static/src/js/services/chat_window_manager.js:283
 #: code:addons/mail/static/src/xml/systray.xml:12
 #: code:addons/mail/static/src/xml/systray.xml:21
 #, python-format
@@ -3363,21 +3194,21 @@ msgstr "Új üzenet"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:233
+#: code:addons/mail/static/src/xml/thread.xml:238
 #, python-format
 msgid "New messages"
 msgstr "Új üzenetek"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:110
+#: code:addons/mail/static/src/xml/thread.xml:115
 #, python-format
 msgid "New messages appear here."
 msgstr "Új üzenetek itt láthatóak."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:97
+#: code:addons/mail/static/src/js/discuss.js:99
 #, python-format
 msgid "New people"
 msgstr "Új személy"
@@ -3388,85 +3219,85 @@ msgid "Next Activities"
 msgstr "Következő tevékenységek"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_date_deadline
 msgid "Next Activity Deadline"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_summary
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_summary
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_summary
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_summary
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_summary
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_summary
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_summary
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_summary
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_summary
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_summary
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_summary
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_summary
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_summary
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_summary
 msgid "Next Activity Summary"
 msgstr "Következő tevékenység összegzése"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_type_id
 msgid "Next Activity Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,field_description:mail.field_mail_activity__has_recommended_activities
 msgid "Next activities available"
 msgstr ""
 
@@ -3510,28 +3341,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:113
+#: code:addons/mail/static/src/xml/thread.xml:118
 #, python-format
 msgid "No starred message"
 msgstr "Nincs kedvenc üzenete"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__no_auto_thread
 msgid "No threading for answers"
 msgstr "Válaszokhoz nincs hozzáfűzve"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_note
+#: model:ir.model.fields,field_description:mail.field_mail_activity__note
 #: model:mail.message.subtype,name:mail.mt_note
 msgid "Note"
 msgstr "Jegyzet"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:157
+#: code:addons/mail/static/src/xml/thread.xml:162
 #, python-format
 msgid "Note by"
 msgstr "Megjegyzése"
@@ -3542,249 +3373,254 @@ msgid "Notification"
 msgstr "Értesítés"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_users_notification_type
+#: model:ir.model.fields,field_description:mail.field_res_users__notification_type
 msgid "Notification Management"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_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 "Értesítések"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers"
 msgstr "Kiértesített követők"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_notify
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_notify
+#: model:ir.model.fields,help:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers of the document (mass post only)"
 msgstr "A dokumentum kiértesített követői (csak tömeges üzenetküldés)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of Actions"
 msgstr "Műveletek száma"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_days
+#: 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_payment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of messages which requires an action"
 msgstr "Üzenetek száma, melyek akciót igényelnek"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread_counter
 msgid "Number of unread messages"
 msgstr "Olvasatlan üzenetek száma"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model:ir.ui.view,arch_db:mail.message_notification_email
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Odoo"
 msgstr "Odoo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:895
+#: code:addons/mail/static/src/js/discuss.js:910
 #, python-format
 msgid ""
 "Odoo has now the permission to send you native notifications on this device."
@@ -3794,14 +3630,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "Odoo needs your permission to"
 msgstr "Odoo rendszernek szüksége van a felhatalmazására ehhez"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:892
+#: code:addons/mail/static/src/js/discuss.js:907
 #, python-format
 msgid ""
 "Odoo will not have the permission to send native notifications on this "
@@ -3812,38 +3648,38 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:120
+#: code:addons/mail/static/src/xml/discuss.xml:120
 #, python-format
 msgid "Offline"
 msgstr "Offline"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_char
 msgid "Old Value Char"
 msgstr "Régi érték tábla"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_datetime
 msgid "Old Value DateTime"
 msgstr "Dátumidő régi értéke"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_float
 msgid "Old Value Float"
 msgstr "Lebegőpontos szám régi értéke"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_integer
 msgid "Old Value Integer"
 msgstr "Egész szám régi értéke"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_monetary
 msgid "Old Value Monetary"
 msgstr "Pénzügyi új érték "
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_text
 msgid "Old Value Text"
 msgstr "Szöveg régi értéke"
 
@@ -3872,14 +3708,14 @@ msgstr "Egy követő"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:118
-#: code:addons/mail/static/src/xml/client_action.xml:202
+#: code:addons/mail/static/src/xml/discuss.xml:118
+#: code:addons/mail/static/src/xml/discuss.xml:202
 #, python-format
 msgid "Online"
 msgstr "Online"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:22
+#: code:addons/mail/models/ir_model.py:28
 #, python-format
 msgid "Only custom models can be modified."
 msgstr ""
@@ -3901,14 +3737,14 @@ msgstr "Szülő dokumentum megnyitása"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Open channel settings"
 msgstr "Csatorna beállítások megnyitása"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:187
+#: code:addons/mail/static/src/xml/discuss.xml:187
 #, python-format
 msgid "Open chat"
 msgstr "Nyílt csevegés"
@@ -3921,15 +3757,15 @@ 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
+#: 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"
 msgstr "Kilép"
 
 #. module: mail
-#: 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_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
 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 "
@@ -3941,8 +3777,8 @@ msgstr ""
 "létrehozása."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,help:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,help:mail.field_mail_template__mail_server_id
 msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
@@ -3951,14 +3787,14 @@ msgstr ""
 "beállítva, akkor a legmagasabb prioritású lesz használva."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_template
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_template
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_template
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_template
 msgid "Optional report to print and attach"
 msgstr "Szabadon választható jelentés nyomtatáshoz vagy mellékletnek"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_lang
-#: model:ir.model.fields,help:mail.field_mail_template_lang
+#: model:ir.model.fields,help:mail.field_email_template_preview__lang
+#: model:ir.model.fields,help:mail.field_mail_template__lang
 msgid ""
 "Optional translation language (ISO code) to select when sending out an "
 "email. If not set, the english version will be used. This should usually be "
@@ -3970,8 +3806,8 @@ msgstr ""
 "mely a megfelelő nyelvről gondoskodik, pl. ${object.partner_id.lang}."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,help:mail.field_mail_template_null_value
+#: model:ir.model.fields,help:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,help:mail.field_mail_template__null_value
 msgid "Optional value to use if the target field is empty"
 msgstr "Szabadon választható érték az üres cél mező kitöltéséhez"
 
@@ -3986,8 +3822,8 @@ msgid "Outgoing"
 msgstr "Kimenő"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__mail_server_id
 msgid "Outgoing Mail Server"
 msgstr "Kimenő Mail szerver"
 
@@ -3997,10 +3833,10 @@ msgid "Outgoing Mails"
 msgstr "Kimenő levelek"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_server_id
 msgid "Outgoing mail server"
 msgstr "Kimenő levelező szerver"
 
@@ -4014,12 +3850,12 @@ msgstr "Kimenő levelező szerver"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4033,43 +3869,43 @@ msgid "Override author's email"
 msgstr "Felülírja a szerző emailjét"
 
 #. module: mail
-#: 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_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
 msgid "Owner"
 msgstr "Tulajdonos"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__parent_id
 msgid "Parent"
 msgstr "Szülő"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__parent_id
 msgid "Parent Message"
 msgstr "Szülő üzenet"
 
 #. module: mail
-#: 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_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
 msgid "Parent Model"
 msgstr "Forrásmodell"
 
 #. module: mail
-#: 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_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
 msgid "Parent Record Thread ID"
 msgstr "Szülő feljegyzés folyamat azonosító ID"
 
 #. module: mail
-#: 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_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
 msgid ""
 "Parent model holding the alias. The model holding the alias reference is not"
 " necessarily the model given by alias_model_id (example: project "
@@ -4080,7 +3916,7 @@ msgstr ""
 "(például: projekt (parent_model) és folyamat (model))"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__parent_id
 msgid ""
 "Parent subtype, used for automatic subscription. This field is not correctly"
 " named. For example on a project, the parent_id of project subtypes refers "
@@ -4109,43 +3945,43 @@ msgstr ""
 "levelezés kampányba"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction_partner_ids
 msgid "Partners with Need Action"
 msgstr "Műveletet igénylő partnerek"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_template__auto_delete
 msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 "Tartósan törli ezt az üzenetet az elküldés után, hely felszabadítása miatt"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:891
+#: code:addons/mail/static/src/js/discuss.js:906
 #, python-format
 msgid "Permission denied"
 msgstr "Hozzáférés elutasítva"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:894
+#: code:addons/mail/static/src/js/discuss.js:909
 #, python-format
 msgid "Permission granted"
 msgstr "Hozzáférés létrehozva"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image
 msgid "Photo"
 msgstr "Fénykép"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,field_description:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,field_description:mail.field_mail_template__copyvalue
 msgid "Placeholder Expression"
 msgstr "Üres mező kifejezés"
 
@@ -4159,12 +3995,12 @@ msgstr "Üres mező kifejezés"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4180,46 +4016,56 @@ msgid "Planned activities"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__days
+msgid "Planned in"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:282
+#: code:addons/mail/static/src/xml/thread.xml:287
 #, python-format
 msgid "Play this video"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:158
+#: code:addons/mail/static/src/js/chatter_composer.js:157
 #, python-format
 msgid "Please complete customer's informations"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:84
+#: code:addons/mail/static/src/js/many2many_tags_email.js:96
 #, python-format
 msgid "Please complete customer's informations and email"
 msgstr ""
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Please contact us instead using"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Please, wait while the file is uploading."
 msgstr "Kérem várjon amíg a fájl feltöltődik."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_notification_type
+#: model:ir.model.fields,help:mail.field_res_users__notification_type
 msgid ""
 "Policy on how to handle Chatter notifications:\n"
-"- Emails: notifications are sent to your email\n"
-"- Odoo: notifications appear in your Odoo Inbox"
+"- Handle by Emails: notifications are sent to your email address\n"
+"- Handle in Odoo: notifications appear in your Odoo Inbox"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_alias_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_channel_alias_contact
-#: model:ir.model.fields,help:mail.field_res_users_alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_channel__alias_contact
+#: model:ir.model.fields,help:mail.field_res_users__alias_contact
 msgid ""
 "Policy to post a message on the document using the mailgateway.\n"
 "- everyone: everyone can post\n"
@@ -4232,12 +4078,13 @@ msgstr ""
 "- követők: csak az idevonatkozó dokumentum követői vagy a következő csatornák tagjai\n"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Powered by"
 msgstr "Támogatja"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_previous_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__previous_type_ids
 msgid "Preceding Activities"
 msgstr "Korábbi műveletek"
 
@@ -4247,8 +4094,8 @@ msgid "Preferred reply address"
 msgstr "Előnyben részesített válasz címek"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,help:mail.field_mail_template_reply_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,help:mail.field_mail_template__reply_to
 msgid "Preferred response address (placeholders may be used here)"
 msgstr ""
 "Előnyben részesített válasz címek (üres karakterek is használhatók itt)"
@@ -4264,27 +4111,27 @@ msgid "Preview of"
 msgstr "Ennek az előnézete"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_previous_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__previous_activity_type_id
 msgid "Previous Activity Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_public
+#: model:ir.model.fields,field_description:mail.field_mail_channel__public
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Privacy"
 msgstr "Adatvédelem"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:56
-#: code:addons/mail/static/src/xml/client_action.xml:176
+#: code:addons/mail/static/src/xml/discuss.xml:56
+#: code:addons/mail/static/src/xml/discuss.xml:176
 #, python-format
 msgid "Private Channels"
 msgstr "Privát csatornák"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:848
+#: code:addons/mail/static/src/js/discuss.js:863
 #, python-format
 msgid "Public Channels"
 msgstr "Nyilvános csatornák"
@@ -4313,68 +4160,72 @@ msgid "Received"
 msgstr "Fogadott"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_id
 msgid "Recipient"
 msgstr "Címzett"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Recipients"
 msgstr "Címzettek"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_recommended_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__recommended_activity_type_id
 msgid "Recommended Activity Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_next_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__next_type_ids
 msgid "Recommended Next Activities"
 msgstr "Ajánlott következő műveletek"
 
 #. module: mail
-#: 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_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
 msgid "Record Thread ID"
 msgstr "Feljegyzés összefűzési azonosító ID"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_references
+#: model:ir.model.fields,field_description:mail.field_mail_mail__references
 msgid "References"
 msgstr "Hivatkozások"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_res_id
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Regards,"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__res_id
 msgid "Related Document ID"
 msgstr "Kapcsolódó dokumentum azonosító ID"
 
 #. 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_mail_model
-#: model:ir.model.fields,field_description:mail.field_mail_message_model
-#: model:ir.model.fields,field_description:mail.field_mail_template_model
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_model
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_model
+#: 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_compose_message__model
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_model
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__model
 msgid "Related Document Model"
 msgstr "Vonatkozó dokumentum modell"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_model
 msgid "Related Document Model Name"
 msgstr ""
 
@@ -4384,12 +4235,12 @@ msgid "Related Message"
 msgstr "Kapcsolódó üzenet"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__partner_id
 msgid "Related Partner"
 msgstr "Kapcsolódó partner"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__relation_field
 msgid "Relation field"
 msgstr "Reléciós/összefüggés mező"
 
@@ -4409,17 +4260,17 @@ msgstr "Követő eltávolítása"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:203
+#: code:addons/mail/static/src/xml/thread.xml:208
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Reply"
 msgstr "Válasz"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,help:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,help:mail.field_mail_message_reply_to
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,help:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,help:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,help:mail.field_mail_message__reply_to
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__reply_to
 msgid ""
 "Reply email address. Setting the reply_to bypasses the automatic thread "
 "creation."
@@ -4428,46 +4279,46 @@ msgstr ""
 " figyelmen kívül hagyásoknak beállítása."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_reply_to
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__reply_to
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__reply_to
 msgid "Reply-To"
 msgstr "Válaszcím"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_name
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_name
 msgid "Report Filename"
 msgstr "Jelentés fájl neve"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_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 "Felelős"
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_user_id
+msgid "Responsible User"
+msgstr "Felelős felhasználó"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
@@ -4476,12 +4327,12 @@ msgid "Retry"
 msgstr "Újra"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body_html
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body_html
 msgid "Rich-text Contents"
 msgstr "Rich-text tartalmak"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_body_html
+#: model:ir.model.fields,help:mail.field_mail_mail__body_html
 msgid "Rich-text/HTML message"
 msgstr "Rich-text/HTML üzenet"
 
@@ -4491,7 +4342,7 @@ msgid "SMTP Server"
 msgstr "SMTP Szerver"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_res_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__res_id
 msgid "Sample Document"
 msgstr "Minta dokumentum"
 
@@ -4525,26 +4376,26 @@ msgid "Schedule activity"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:250
+#: code:addons/mail/models/mail_activity.py:260
 #, python-format
 msgid "Schedule an Activity"
 msgstr "Ütemezzen egy művelet"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:57
 #, 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
+#: 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"
 msgstr "Tervezett dátum"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__scheduled_date
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Scheduled Send Date"
 msgstr "Tervezett elküldési dátum"
@@ -4560,8 +4411,8 @@ msgid "Search Groups"
 msgstr "Csoportok keresése"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__model_object_field
 msgid ""
 "Select target field from the related document model.\n"
 "If it is a relationship field you will be able to select a target field at the destination of the relationship."
@@ -4576,19 +4427,19 @@ msgstr "Kiválasztott felhasználók csoportja"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:374
+#: code:addons/mail/static/src/js/composer.js:428
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Send"
 msgstr "Küldés"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail
 msgid "Send Email"
 msgstr "E-mail küldés"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:264
+#: code:addons/mail/models/mail_template.py:295
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Levél küldése (%s)"
@@ -4614,13 +4465,13 @@ msgid "Send message"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
+#: model:ir.model.fields,field_description:mail.field_mail_channel__email_send
 msgid "Send messages by email"
 msgstr "Üzenetek küldése emailben"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_from
-#: model:ir.model.fields,help:mail.field_mail_template_email_from
+#: model:ir.model.fields,help:mail.field_email_template_preview__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 "
 "value will be the author's email alias if configured, or email address."
@@ -4631,14 +4482,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Sending Error"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:108
+#: code:addons/mail/static/src/xml/discuss.xml:108
 #, python-format
 msgid "Sends messages by email"
 msgstr "Üzeneteket küld emailben"
@@ -4650,25 +4501,30 @@ msgid "Sent"
 msgstr "Elküldött"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_email
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "Sent by"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_email
 msgid "Sent by Email"
 msgstr "Email-ben küldés"
 
 #. 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
+#: 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 "Sorszám"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Settings"
 msgstr "Beállítások"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__shortcode_type
 msgid "Shortcode Type"
 msgstr ""
 
@@ -4679,7 +4535,7 @@ msgid "Shortcodes"
 msgstr "Billentyűparancsok"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__source
 msgid "Shortcut"
 msgstr "Gyorsbillentyű"
 
@@ -4692,20 +4548,20 @@ msgstr ""
 "előtti"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:667
+#: code:addons/mail/models/mail_channel.py:673
 #, python-format
 msgid "Show an helper message"
 msgstr "Mutass egy súgó üzenetet"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,field_description:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_mail_template__ref_ir_act_window
 msgid "Sidebar action"
 msgstr "Oldalkeret művelet"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,help:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_mail_template__ref_ir_act_window
 msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
@@ -4714,10 +4570,10 @@ msgstr ""
 "dokumentum modell feljegyzéseken"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_avatar
 msgid ""
 "Small-sized image of this contact. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4728,12 +4584,12 @@ msgstr ""
 "bárhol, ahol kis képre van szükség."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_small
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_small
 msgid "Small-sized photo"
 msgstr "Kis-méretű fotó"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_small
+#: model:ir.model.fields,help:mail.field_mail_channel__image_small
 msgid ""
 "Small-sized photo of the group. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4749,7 +4605,7 @@ msgid "Smiley"
 msgstr "Szmájlik"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_res_model_id
+#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_id
 msgid ""
 "Specify a model if the activity should be specific to a model and not "
 "available when managing activities for other models."
@@ -4757,74 +4613,52 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:661
-#: code:addons/mail/static/src/xml/client_action.xml:28
-#: code:addons/mail/static/src/xml/client_action.xml:156
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred
+#: code:addons/mail/static/src/js/services/chat_manager.js:89
+#: code:addons/mail/static/src/xml/discuss.xml:28
+#: code:addons/mail/static/src/xml/discuss.xml:156
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred
 #, python-format
 msgid "Starred"
 msgstr "Kedvenc"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_state
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_state
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_mail_activity__state
 msgid "State"
 msgstr "Állapot"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_state
+#: 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
 msgid "Status"
 msgstr "Állapot"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,help:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,help:mail.field_event_track_activity_state
-#: model:ir.model.fields,help:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,help:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,help:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,help:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,help:mail.field_product_template_activity_state
-#: model:ir.model.fields,help:mail.field_project_task_activity_state
-#: model:ir.model.fields,help:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,help:mail.field_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
+#: model:ir.model.fields,help:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,help:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,help:mail.field_event_track__activity_state
+#: model:ir.model.fields,help:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,help:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,help:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,help:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,help:mail.field_note_note__activity_state
+#: model:ir.model.fields,help:mail.field_product_product__activity_state
+#: model:ir.model.fields,help:mail.field_product_template__activity_state
+#: model:ir.model.fields,help:mail.field_project_task__activity_state
+#: model:ir.model.fields,help:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,help:mail.field_repair_order__activity_state
+#: model:ir.model.fields,help:mail.field_res_partner__activity_state
+#: model:ir.model.fields,help:mail.field_res_users__activity_state
+#: model:ir.model.fields,help:mail.field_sale_order__activity_state
+#: model:ir.model.fields,help:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,help:mail.field_survey_survey__activity_state
 msgid ""
 "Status based on activities\n"
 "Overdue: Due date is already passed\n"
@@ -4833,33 +4667,33 @@ msgid ""
 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
+#: 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"
 msgstr "Alárendelt-mező"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,field_description:mail.field_mail_template_sub_object
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,field_description:mail.field_mail_template__sub_object
 msgid "Sub-model"
 msgstr "Alárendel-modell"
 
 #. module: mail
 #. 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_mail_compose_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_mail_subject
-#: model:ir.model.fields,field_description:mail.field_mail_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_template_subject
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subject
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__subject
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_mail__subject
+#: model:ir.model.fields,field_description:mail.field_mail_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_template__subject
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subject
 #, python-format
 msgid "Subject"
 msgstr "Tárgy"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_subject
-#: model:ir.model.fields,help:mail.field_mail_template_subject
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr "Tárgy (üres karakterek is használhatók itt)"
@@ -4871,22 +4705,22 @@ msgstr "Tárgy..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:216
+#: code:addons/mail/static/src/xml/thread.xml:221
 #, python-format
 msgid "Subject:"
 msgstr "Tárgy:"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_substitution
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__substitution
 msgid "Substitution"
 msgstr "Helyettesít"
 
 #. module: mail
-#: 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_1993
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subtype_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subtype_id
 #: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
 msgid "Subtype"
 msgstr "Altípus"
@@ -4898,8 +4732,8 @@ msgid "Subtypes"
 msgstr "Altípusok"
 
 #. 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
+#: 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 "Összegzés"
 
@@ -4911,7 +4745,7 @@ msgid "System notification"
 msgstr "Rendszerüzenet"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,help:mail.field_mail_activity__has_recommended_activities
 msgid "Technical field for UX purpose"
 msgstr ""
 
@@ -4921,6 +4755,14 @@ msgid "Template Preview"
 msgstr "Sablon megtekintése"
 
 #. module: mail
+#: code:addons/mail/models/mail_template.py:264
+#, python-format
+msgid ""
+"Template rendering failed, this could mean that your template contains "
+"python syntax errors"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_template_tree_all
 #: model:ir.ui.menu,name:mail.menu_email_templates
 #: model:ir.ui.view,arch_db:mail.email_template_form
@@ -4930,14 +4772,24 @@ msgid "Templates"
 msgstr "Sablonok"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The"
+msgstr "A"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The email sent to"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_shortcode__substitution
 msgid "The escaped html code replacing the shortcut"
 msgstr "A kivett html kód helyettesíti a gyorsbillentyűt"
 
 #. module: mail
-#: 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_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
 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 "
@@ -4948,9 +4800,9 @@ msgstr ""
 "feljegyzést fog létrehozni ehhez a modellhez (pl. egy projekt ügyet)"
 
 #. module: mail
-#: 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_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
 msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
@@ -4959,9 +4811,9 @@ msgstr ""
 "<allasok@pelda.odoo.com>"
 
 #. module: mail
-#: 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_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
 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 "
@@ -4975,9 +4827,9 @@ msgstr ""
 "felhasználót azzal a címmel."
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:165
-#: code:addons/mail/models/mail_message.py:579
-#: code:addons/mail/models/mail_message.py:674
+#: code:addons/mail/models/mail_activity.py:175
+#: code:addons/mail/models/mail_message.py:578
+#: code:addons/mail/models/mail_message.py:678
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -4989,18 +4841,18 @@ msgstr ""
 "(Dokumentum típus: %s, Művelet: %s)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__source
 msgid "The shortcut which must be replaced in the Chat Messages"
 msgstr "Gyorsbillentyű mely a társalgások menüben ki lesz cserélve"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__unicode_source
 msgid "The source is replaced by this unicode character in the Chat Messages"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,help:mail.field_mail_template_model_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,help:mail.field_mail_template__model_id
 msgid "The type of document this template can be used with"
 msgstr "Ennek a sablonnak a dokumentum típusát használhatja ezzel"
 
@@ -5010,7 +4862,7 @@ msgid "This"
 msgstr "Ez"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image
+#: model:ir.model.fields,help:mail.field_mail_channel__image
 msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
@@ -5018,7 +4870,7 @@ msgstr ""
 "Ez a mező a képet tárolja amit a csoporthoz használ, limitálva 1024x1024px."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_public
+#: model:ir.model.fields,help:mail.field_mail_channel__public
 msgid ""
 "This group is visible by non members. Invisible groups can add members "
 "through the invite button."
@@ -5032,20 +4884,20 @@ msgid "Thread"
 msgstr "Szál"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_to
 msgid "To"
 msgstr "Címzett"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_to
 msgid "To (Emails)"
 msgstr "(E-mailek) eléréséhez"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_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
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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)"
 msgstr "Részére (Partnereknek)"
 
@@ -5060,8 +4912,8 @@ msgstr "Címzett:"
 #. module: mail
 #. openerp-web
 #: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:25
-#: code:addons/mail/static/src/js/thread.js:242
+#: code:addons/mail/static/src/js/activity.js:82
+#: code:addons/mail/static/src/js/thread.js:328
 #: code:addons/mail/static/src/xml/systray.xml:75
 #: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
 #: selection:hr.applicant,activity_state:0
@@ -5071,12 +4923,12 @@ msgstr "Címzett:"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -5098,7 +4950,7 @@ msgstr "Tennivalók"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:35
+#: code:addons/mail/static/src/js/activity.js:92
 #, python-format
 msgid "Tomorrow"
 msgstr "Holnap"
@@ -5109,10 +4961,10 @@ msgid "Topics discussed in this group..."
 msgstr "A csoport által megbeszélt témák..."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid ""
 "Tracked values are stored in a separate model. This field allow to "
 "reconstruct the tracking and to generate statistics on the model."
@@ -5121,7 +4973,7 @@ msgstr ""
 "a követést és a statisztika generálását a modellhez."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,field_description:mail.field_ir_model_fields__track_visibility
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Tracking"
 msgstr "Nyomonkövetés"
@@ -5139,28 +4991,28 @@ msgid "Tracking Values"
 msgstr "Nyomon követési értékek"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid "Tracking values"
 msgstr "Nyomon követési értékek"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_type
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_type
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_type
 msgid "Type"
 msgstr "Típus"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_uuid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__uuid
 msgid "UUID"
 msgstr "UUID"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:235
+#: code:addons/mail/models/mail_mail.py:233
 #, python-format
 msgid "Unable to connect to SMTP Server"
 msgstr ""
@@ -5173,7 +5025,6 @@ msgstr "Nem tud e-mailt küldeni, kérem állítsa be a küldő e-mail címét."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:700
 #: code:addons/mail/static/src/xml/followers.xml:22
 #, python-format
 msgid "Unfollow"
@@ -5187,143 +5038,145 @@ msgstr ""
 "Sajnos ez az email álnév már használva van, kérem válasszon egy egyedit."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__unicode_source
 msgid "Unicode Character"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread
 msgid "Unread Messages"
 msgstr "Olvasatlan üzenetek"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread_counter
 msgid "Unread Messages Counter"
 msgstr "Olvasatlan üzenetek számlálója"
 
@@ -5334,61 +5187,61 @@ msgstr "Olvasatlan üzenetek"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all"
 msgstr "Összes eltávolítása a kedvencekből"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all messages"
 msgstr "Összes üzenet eltávolítása a kedvencekből"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe from channel"
 msgstr "Leiratkozás a csatornáról"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:510
+#: code:addons/mail/models/mail_template.py:504
 #, python-format
 msgid "Unsupported report type %s found."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:322
+#: code:addons/mail/static/src/xml/thread.xml:327
 #, python-format
 msgid "Uploading"
 msgstr "Feltöltés"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Uploading error"
 msgstr "Feltöltési hiba"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_use_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_use_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__use_active_domain
 msgid "Use active domain"
 msgstr "Használja az aktív domaint"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_template_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_template_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__template_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__template_id
 msgid "Use template"
 msgstr "Sablon használata"
 
@@ -5398,7 +5251,7 @@ msgid "Use your own email servers"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_sequence
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__sequence
 msgid "Used to order subtypes."
 msgstr "Használja altípusok rendezéséhez."
 
@@ -5411,7 +5264,7 @@ msgstr "Felhasználó"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:51
+#: code:addons/mail/static/src/xml/discuss.xml:51
 #: code:addons/mail/static/src/xml/extended_chat_window.xml:8
 #, python-format
 msgid "User name"
@@ -5423,7 +5276,7 @@ msgid "Users"
 msgstr "Felhasználók"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:711
+#: code:addons/mail/models/mail_channel.py:717
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Felhasználók ebben a csatornában: %s %s és Ön."
@@ -5437,14 +5290,14 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:670
+#: code:addons/mail/models/mail_thread.py:696
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 #, python-format
 msgid "View"
 msgstr "Nézet"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:668
+#: code:addons/mail/models/mail_thread.py:694
 #, python-format
 msgid "View %s"
 msgstr ""
@@ -5460,8 +5313,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_sub_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__sub_model_object_field
 msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
@@ -5471,8 +5324,8 @@ msgstr ""
 "kiválasztani a cél-mezőt."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,help:mail.field_mail_template_sub_object
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,help:mail.field_mail_template__sub_object
 msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
@@ -5481,20 +5334,20 @@ msgstr ""
 "kihez kapcsolódik a dokumentum modell."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,help:mail.field_ir_model_fields__track_visibility
 msgid ""
 "When set, every modification to this field will be tracked in the chatter."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_is_log
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_is_log
+#: model:ir.model.fields,help:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__is_log
 msgid "Whether the message is an internal note (comment mode only)"
 msgstr ""
 "Akkor is, ha az üzenet egy balső megjegyzés (kizárólag hozzászólás módban)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,help:mail.field_ir_model__is_mail_thread
 msgid "Whether this model supports messages and notifications."
 msgstr ""
 
@@ -5512,47 +5365,47 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:12
+#: code:addons/mail/static/src/xml/composer.xml:11
 #, python-format
-msgid "Write something..."
-msgstr "Írj valamit..."
+msgid "Write Something..."
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:29
-#: code:addons/mail/static/src/js/thread.js:244
+#: code:addons/mail/static/src/js/activity.js:86
+#: code:addons/mail/static/src/js/thread.js:330
 #, python-format
 msgid "Yesterday"
 msgstr "Tegnap"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:96
+#: code:addons/mail/static/src/js/discuss.js:98
 #, python-format
 msgid "You added <b>%s</b> to the conversation."
 msgstr "Hozzáadta a <b>%s</b> ehhez a beszélgetéshez."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:708
+#: code:addons/mail/models/mail_channel.py:714
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Egyedül van ebben a csatornában."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:677
+#: code:addons/mail/models/mail_channel.py:683
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "Privát megbeszélése van vele: <b>@%s</b>."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:672
+#: code:addons/mail/models/mail_channel.py:678
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Ebben a csatornában van: <b>#%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:114
+#: code:addons/mail/static/src/xml/thread.xml:119
 #, python-format
 msgid ""
 "You can mark any message as 'starred', and it shows up in this channel."
@@ -5561,7 +5414,7 @@ msgstr ""
 "csatornában."
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:54
+#: code:addons/mail/models/res_users.py:53
 #, python-format
 msgid ""
 "You cannot create a new user from here.\n"
@@ -5581,14 +5434,11 @@ msgstr ""
 " másik moduloknak."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:349
+#: code:addons/mail/models/mail_thread.py:342
 #, python-format
 msgid ""
-"You could also add a new %(document)s by sending an email to: "
-"%(email_link)s."
+"You could also add a new %(document)s by sending an email to %(email_link)s"
 msgstr ""
-"Hozzáadhat egy új %(document)s egy email elküldésével ehhez a címzetthez: "
-"%(email_link)s."
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
@@ -5597,14 +5447,14 @@ msgstr "Ön hozzárendelt ehhez"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "You have been invited to: "
 msgstr "Ön meghívót kapott:"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,help:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_template__attachment_ids
 msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
@@ -5614,28 +5464,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:473
+#: code:addons/mail/static/src/js/services/chat_manager.js:1536
 #, python-format
 msgid "You unpinned your conversation with <b>%s</b>."
 msgstr "Rögzítetlenné tette a megbeszélését vele <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:471
+#: code:addons/mail/static/src/js/services/chat_manager.js:1534
 #, python-format
 msgid "You unsubscribed from <b>%s</b>."
 msgstr "Leiratkozott erről <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:217
+#: code:addons/mail/static/src/xml/discuss.xml:217
 #, python-format
 msgid "You:"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Your message has not been sent."
 msgstr ""
@@ -5647,23 +5497,35 @@ msgid "Your template should define email_from"
 msgstr "Sablonjának meg kell határoznia az email_from formát"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "alias %s: %s"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
+msgid "base.partner.merge.automatic.wizard"
+msgstr "base.partner.merge.automatic.wizard"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "by"
 msgstr "által"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid ""
+"cannot be processed. This address\n"
+"    is used to collect replies and should not be used to directly contact"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "létrehozta"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:315
+#: code:addons/mail/models/mail_thread.py:309
 #, python-format
 msgid "document"
 msgstr "dokumentum"
@@ -5682,7 +5544,7 @@ msgstr "pl. Hozzászólási  javaslat"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "enable desktop notifications"
 msgstr "asztali üzenetek bekapcsolása"
@@ -5717,13 +5579,13 @@ msgid "has been"
 msgstr "lett"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:282
+#: code:addons/mail/models/mail_alias.py:271
 #, python-format
 msgid "incorrectly configured alias"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:278
+#: code:addons/mail/models/mail_alias.py:267
 #, python-format
 msgid "incorrectly configured alias (unknown reference record)"
 msgstr ""
@@ -5744,19 +5606,19 @@ msgid "mail.alias.mixin"
 msgstr "mail.alias.mixin"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:943
+#: code:addons/mail/models/mail_thread.py:925
 #, python-format
 msgid "model %s does not accept document creation"
 msgstr "%s modell nem fogadja el a dokumentum létrehozást"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:938
+#: code:addons/mail/models/mail_thread.py:920
 #, python-format
 msgid "model %s does not accept document update"
 msgstr "%s modell nem fogadja el a dokumentum frissítést"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:931
+#: code:addons/mail/models/mail_thread.py:913
 #, python-format
 msgid ""
 "model %s does not accept document update, fall back on document creation"
@@ -5783,14 +5645,14 @@ msgstr "most"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:177
+#: code:addons/mail/static/src/xml/thread.xml:181
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "on"
 msgstr "ezen"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid ""
 "posting a message without model should be with a null res_id (private "
@@ -5800,7 +5662,7 @@ msgstr ""
 "üzenet), beérkezett %s"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:917
+#: code:addons/mail/models/mail_thread.py:899
 #, python-format
 msgid ""
 "posting a message without model should be with a parent_id (private message)"
@@ -5833,13 +5695,13 @@ msgid "record:"
 msgstr "feljegyzés:"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:935
+#: code:addons/mail/models/mail_thread.py:917
 #, python-format
 msgid "reply to missing document (%s,%s)"
 msgstr "válasz hiányzó dokumentumra (%s,%s)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:928
+#: code:addons/mail/models/mail_thread.py:910
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
 msgstr ""
@@ -5851,40 +5713,45 @@ msgid "res.config.settings"
 msgstr "res.config.settings"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid "resetting thread_id"
 msgstr "Visszaállítja a thread_id"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:254
+#: code:addons/mail/models/mail_channel.py:252
 #, python-format
 msgid "restricted to channel members"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:287
+#: code:addons/mail/models/mail_alias.py:276
 #, python-format
 msgid "restricted to followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:291
+#: code:addons/mail/models/mail_alias.py:280
 #, python-format
 msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:899
 #: code:addons/mail/models/mail_thread.py:917
-#: code:addons/mail/models/mail_thread.py:935
-#: code:addons/mail/models/mail_thread.py:938
-#: code:addons/mail/models/mail_thread.py:943
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:920
+#: code:addons/mail/models/mail_thread.py:925
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "skipping"
 msgstr "átugorja"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "team."
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:20
 #, python-format
@@ -5892,13 +5759,18 @@ msgid "this document"
 msgstr "ez a dokumentum"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "unknown error"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:906
+#: code:addons/mail/models/mail_thread.py:888
 #, python-format
 msgid "unknown target model %s"
 msgstr "ismeretlen cél modell %s"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "using"
+msgstr ""
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index 47e7ed6123e..9b82e7057dd 100644
--- a/addons/mail/i18n/nl.po
+++ b/addons/mail/i18n/nl.po
@@ -13,10 +13,10 @@
 # Melroy van den Berg <webmaster1989@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.1\n"
+"Project-Id-Version: Odoo Server saas~11.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-13 14:36+0000\n"
-"PO-Revision-Date: 2017-12-13 14:36+0000\n"
+"POT-Creation-Date: 2018-03-22 14:10+0000\n"
+"PO-Revision-Date: 2018-03-22 14:10+0000\n"
 "Last-Translator: Melroy van den Berg <webmaster1989@gmail.com>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -26,254 +26,59 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_data_notification_email_default
-msgid ""
-"\n"
-"% set company = ctx.get('company', user.company_id)\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"
-"        <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-"        <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
-"    </div>\n"
-"</div>\n"
-"% endif\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('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('has_button_follow'):\n"
-"        % if ctx.get('has_button_access'):\n"
-"           |\n"
-"        % endif\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=\"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=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
-"        % endfor\n"
-"        % endif\n"
-"    </td>\n"
-"    <td valign=\"center\" align=\"right\">\n"
-"        <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\">\n"
-"    </td>\n"
-"</tr>\n"
-"<tr>\n"
-"    <td colspan=\"2\" style=\"text-align:center;\">\n"
-"        <hr width=\"100%\"\n"
-"            style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
-"        % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
-"        <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n"
-"            <strong>Internal communication</strong>: Replying will post an internal note. Followers won't receive any email notification.\n"
-"        </p>\n"
-"        % endif\n"
-"    </td>\n"
-"</tr>\n"
-"</tbody></table>\n"
-"</div>\n"
-"% endif\n"
-"<div>\n"
-"    ${object.body | safe}\n"
-"</div>\n"
-"% if ctx.get('tracking'):\n"
-"    <ul>\n"
-"    % for tracking in ctx['tracking']\n"
-"        <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
-"    % endfor\n"
-"    </ul>\n"
-"% endif\n"
-"\n"
-"% if ctx.get('signature'):\n"
-"    ${ctx['signature'] | safe}\n"
-"% endif\n"
-"<br/>\n"
-"<p style=\"color: #555555;\">\n"
-"    Sent by\n"
-"    % if ctx.get('website_url'):\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 target=\"_blank\" href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\">Odoo</a>.\n"
-"</p>\n"
-"</div>"
-msgstr ""
-"\n"
-"% set company = ctx.get('company', user.company_id)\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"
-"        <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-"        <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
-"    </div>\n"
-"</div>\n"
-"% endif\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('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('has_button_follow'):\n"
-"        % if ctx.get('has_button_access'):\n"
-"           |\n"
-"        % endif\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=\"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=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
-"        % endfor\n"
-"        % endif\n"
-"    </td>\n"
-"    <td valign=\"center\" align=\"right\">\n"
-"        <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\">\n"
-"    </td>\n"
-"</tr>\n"
-"<tr>\n"
-"    <td colspan=\"2\" style=\"text-align:center;\">\n"
-"        <hr width=\"100%\"\n"
-"            style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
-"        % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
-"        <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n"
-"            <strong>Interne communicatie</strong>: Reageren zal een interne notitie maken. Volgers krijgen geen bericht per e-mail.\n"
-"        </p>\n"
-"        % endif\n"
-"    </td>\n"
-"</tr>\n"
-"</tbody></table>\n"
-"</div>\n"
-"% endif\n"
-"<div>\n"
-"    ${object.body | safe}\n"
-"</div>\n"
-"% if ctx.get('tracking'):\n"
-"    <ul>\n"
-"    % for tracking in ctx['tracking']\n"
-"        <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
-"    % endfor\n"
-"    </ul>\n"
-"% endif\n"
-"\n"
-"% if ctx.get('signature'):\n"
-"    ${ctx['signature'] | safe}\n"
-"% endif\n"
-"<br/>\n"
-"<p style=\"color: #555555;\">\n"
-"    Gestuurd voor \n"
-"    % if ctx.get('website_url'):\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"
-"   met \n"
-"    <a target=\"_blank\" href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\">Odoo</a>.\n"
-"</p>\n"
-"</div>"
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:674
+#: code:addons/mail/models/mail_channel.py:680
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr "Dit kanaal is privé. Mensen moeten uitgenodigd zijn om toe te treden."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_days
-msgid "# Days"
-msgstr "# Dagen"
-
-#. 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) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-msgstr ""
-"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:63
+#: code:addons/mail/static/src/js/services/chat_manager.js:1634
 #, python-format
 msgid "%d Messages"
 msgstr "%d Berichten"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:31
+#: code:addons/mail/static/src/js/activity.js:88
 #, python-format
 msgid "%d days overdue"
 msgstr "%d dagen over tijd"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:248
+#: code:addons/mail/models/mail_template.py:279
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:236
+#: code:addons/mail/models/mail_thread.py:234
 #, python-format
 msgid "%s created"
 msgstr "%s aangemaakt"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:81
+#: code:addons/mail/models/res_users.py:80
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s heeft zich aangesloten bij het %s netwerk."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:211
 #, python-format
 msgid "&nbsp;("
 msgstr "&nbsp;("
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:179
+#: code:addons/mail/static/src/xml/thread.xml:184
 #, python-format
 msgid "(from"
 msgstr "(van"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,help:mail.field_mail_shortcode__shortcode_type
 msgid ""
 "* Smiley are only used for HTML code to display an image * Text (default "
 "value) is used to substitute text with another text"
@@ -290,7 +95,7 @@ msgstr ", vervalt op"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:331
+#: code:addons/mail/static/src/xml/thread.xml:336
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr "-------- Toon oude berichten --------"
@@ -317,7 +122,7 @@ msgid "0 Today"
 msgstr "0 Vandaag"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:684
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -333,7 +138,19 @@ msgstr ""
 "U kunt een standaard antwoord in uw bericht toevoegen door te typen <b>:shortcut</b>."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:584
+#: code:addons/mail/models/mail_channel.py:507
+#, python-format
+msgid ""
+"<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
+"href=\"#\" class=\"o_channel_redirect\" data-oe-"
+"id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
+msgstr ""
+"<div class=\"o_mail_notification\">%(author)s uitgenodigd %(new_partner)s "
+"voor <a href=\"#\" class=\"o_channel_redirect\" data-oe-"
+"id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:590
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -343,8 +160,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:508
-#: code:addons/mail/models/mail_channel.py:561
+#: code:addons/mail/models/mail_channel.py:514
+#: code:addons/mail/models/mail_channel.py:567
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -475,6 +292,11 @@ msgstr ""
 "                                    <span class=\"o_stat_text\">Context actie</span>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+msgid "<span class=\"oe_inline\">days</span>"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>\n"
@@ -497,6 +319,13 @@ msgid "<strong> Feedback</strong>"
 msgstr "<strong> Feedback</strong>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid ""
+"<strong>Internal communication</strong>: Replying will post an internal "
+"note. Followers won't receive any email notification."
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>Only records checked in list view will be used.</strong><br/>\n"
@@ -511,9 +340,9 @@ msgid "<strong>Recommended Activities</strong>"
 msgstr "<strong>Aanbevolen activiteiten:</strong>"
 
 #. 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_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
 msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
@@ -536,115 +365,118 @@ msgid "Access Groups"
 msgstr "Toegang groepen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction
 msgid "Action Needed"
 msgstr "Vereist actie"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__default
 msgid "Activated by default when subscribing."
 msgstr "Standaard activeren bij abonneren"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__active
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_search
 msgid "Active"
 msgstr "Actief"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__active_domain
 msgid "Active domain"
 msgstr "Actief domein"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/systray.xml:87
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_ids
-#: model:ir.model.fields,field_description:mail.field_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.model.fields,field_description:mail.field_account_invoice__activity_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_ids
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
 #: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 #: model:mail.message.subtype,name:mail.mt_activities
@@ -656,7 +488,7 @@ msgstr "Activiteiten"
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:60
 #: model:ir.model,name:mail.model_mail_activity
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_type_id
+#: 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
@@ -670,6 +502,32 @@ msgid "Activity Mixin"
 msgstr "Activiteit Mixin"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_state
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_state
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_state
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_state
+msgid "Activity State"
+msgstr "Activiteitsfase"
+
+#. 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"
@@ -691,7 +549,7 @@ msgstr "Soort activiteit"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:87
+#: code:addons/mail/static/src/xml/discuss.xml:87
 #, python-format
 msgid "Add"
 msgstr "Toevoegen"
@@ -699,7 +557,7 @@ msgstr "Toevoegen"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:64
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_channel_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__channel_ids
 #, python-format
 msgid "Add Channels"
 msgstr "Voeg kanalen toe"
@@ -707,7 +565,7 @@ msgstr "Voeg kanalen toe"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:61
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_partner_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
 msgid "Add Followers"
@@ -720,22 +578,28 @@ msgid "Add Followers can only be done on a mail thread model"
 msgstr "Volgers kunnen alleen worden toegevoegd op het mail thread model"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,field_description:mail.field_mail_template_user_signature
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,field_description:mail.field_mail_template__user_signature
 msgid "Add Signature"
 msgstr "Handtekening toevoegen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:41
-#: code:addons/mail/static/src/xml/client_action.xml:186
+#: code:addons/mail/static/src/xml/discuss.xml:41
+#: code:addons/mail/static/src/xml/discuss.xml:186
 #, python-format
 msgid "Add a channel"
 msgstr "Voeg een kanaal toe"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:335
+#, python-format
+msgid "Add a new %(document)s or send an email to %(email_link)s"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:60
+#: code:addons/mail/static/src/xml/discuss.xml:60
 #, python-format
 msgid "Add a private channel"
 msgstr "Voeg een privé kanaal toe"
@@ -752,7 +616,7 @@ msgid "Add contacts to notify..."
 msgstr "Voeg contacten toe om te informeren..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
 msgid "Additional Contacts"
 msgstr "Aanvullende contacten"
 
@@ -767,45 +631,45 @@ msgid "Advanced Settings"
 msgstr "Geavanceerde instellingen"
 
 #. 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_res_users_alias_id
+#: 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_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
 msgid "Alias"
 msgstr "Alias"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_contact
+#: 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
+#: model:ir.model.fields,field_description:mail.field_res_users__alias_contact
 msgid "Alias Contact Security"
 msgstr "Alias contact beveiliging"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__alias_domain
 msgid "Alias Domain"
 msgstr "Alias domein"
 
 #. module: mail
-#: 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_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
 msgid "Alias Name"
 msgstr "Alias naam"
 
 #. module: mail
-#: 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_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
 msgid "Alias domain"
 msgstr "Aliasdomein"
 
 #. module: mail
-#: 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_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
 msgid "Aliased Model"
 msgstr "Aliased Model"
 
@@ -830,16 +694,16 @@ msgstr "Altijd"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:198
+#: code:addons/mail/static/src/js/services/chat_manager.js:1328
 #, python-format
 msgid "Anonymous"
 msgstr "Anoniem"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__no_auto_thread
 msgid ""
 "Answers do not go in the original document discussion thread. This has an "
 "impact on the generated message-id."
@@ -848,8 +712,8 @@ msgstr ""
 " gevolgen voor het gegenereerde bericht-id."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_id
 msgid "Applies to"
 msgstr "Heeft betrekking op"
 
@@ -861,9 +725,14 @@ msgid "Apply"
 msgstr "Toepassen"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+msgid "Archived"
+msgstr "Gearchiveerd"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:45
-#: model:ir.model.fields,field_description:mail.field_mail_activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
 #, python-format
 msgid "Assigned to"
 msgstr "Toegewezen aan"
@@ -874,19 +743,19 @@ msgid "Attach a file"
 msgstr "Voeg een bijlage toe"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_template__attachment_ids
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Attachments"
 msgstr "Bijlagen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_message_attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_message__attachment_ids
 msgid ""
 "Attachments are linked to a document through model / res_id and to the "
 "message through this field."
@@ -905,10 +774,10 @@ msgid "Authenticated Partners"
 msgstr "Geauthenticeerde relaties"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_id
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Author"
 msgstr "Auteur"
@@ -919,10 +788,10 @@ msgid "Author Signature (mass mail only)"
 msgstr "Handtekening auteur (alleen bulk mailing)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,help:mail.field_mail_mail_author_id
-#: model:ir.model.fields,help:mail.field_mail_message_author_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,help:mail.field_mail_mail__author_id
+#: model:ir.model.fields,help:mail.field_mail_message__author_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_id
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that"
 " did not match any partner."
@@ -931,27 +800,27 @@ msgstr ""
 "e-mailadres bevatten wat niet overeenkomt met een relatie."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_avatar
 msgid "Author's avatar"
 msgstr "Avatar van auteur"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_public_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_public_id
 msgid "Authorized Group"
 msgstr "Geautoriseerde groep"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_template__auto_delete
 msgid "Auto Delete"
 msgstr "Auto-verwijder"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_ids
 msgid "Auto Subscription"
 msgstr "Automatisch abonneren"
 
@@ -973,16 +842,16 @@ msgid "Be careful with channels following internal notifications"
 msgstr "Wees voorzichtig met kanalen die interne notificaties volgen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
-#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
 msgid "Body"
 msgstr "Inhoud"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,field_description:mail.field_res_users_message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_users__message_bounce
 msgid "Bounce"
 msgstr "Bounce"
 
@@ -1028,35 +897,35 @@ msgid "Canned Response / Shortcode"
 msgstr "Ingeblikte reactie / shortcode"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_cc
+#: model:ir.model.fields,help:mail.field_mail_mail__email_cc
 msgid "Carbon copy message recipients"
 msgstr "CC ontvangers van het bericht"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,help:mail.field_mail_template_email_cc
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,help:mail.field_mail_template__email_cc
 msgid "Carbon copy recipients (placeholders may be used here)"
 msgstr ""
 "Carbon Copy ontvanger (tijdelijke aanduidingen kan hier worden gebruikt)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,help:mail.field_mail_activity_type_category
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,help:mail.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
 msgstr ""
 "Categorieën kunnen specifiek gedrag triggeren, zoals het openen van een "
 "kalender."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__category
 msgid "Category"
 msgstr "Categorie"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_cc
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_cc
 msgid "Cc"
 msgstr "CC"
 
@@ -1066,40 +935,40 @@ msgid "Change"
 msgstr "Wisselgeld"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field
 msgid "Changed Field"
 msgstr "Veranderd veld"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
 #: selection:mail.channel,channel_type:0
 msgid "Channel"
 msgstr "Kanaal"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_message_ids
 msgid "Channel Message"
 msgstr "Kanaal bericht"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_type
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_type
 msgid "Channel Type"
 msgstr "Kanaalsoort"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:36
-#: code:addons/mail/static/src/xml/client_action.xml:172
+#: code:addons/mail/static/src/xml/discuss.xml:36
+#: code:addons/mail/static/src/xml/discuss.xml:172
 #: code:addons/mail/static/src/xml/systray.xml:19
 #: code:addons/mail/static/src/xml/systray.xml:36
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__channel_ids
 #: model:ir.ui.menu,name:mail.mail_channel_menu_settings
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
 #, python-format
@@ -1114,7 +983,7 @@ msgstr "Kanalen/Partners"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:168
+#: code:addons/mail/static/src/xml/discuss.xml:168
 #: code:addons/mail/static/src/xml/systray.xml:18
 #: code:addons/mail/static/src/xml/systray.xml:32
 #: model:ir.actions.client,name:mail.mail_channel_action_client_chat
@@ -1133,10 +1002,10 @@ msgid "Chat Shortcode"
 msgstr "Chat shortcode"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__child_ids
 msgid "Child Messages"
 msgstr "Onderliggende berichten"
 
@@ -1146,25 +1015,6 @@ msgid "Choose an example"
 msgstr "Kies een voorbeeld"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:342
-#, python-format
-msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
-msgstr ""
-"Klik hier om een nieuw %(document)s toe te voegen of verzend een e-mail "
-"naar: %(email_link)s"
-
-#. module: mail
-#: code:addons/mail/models/mail_thread.py:358
-#, python-format
-msgid "Click here to add new %s"
-msgstr "Klik hier om nieuw %s toe te voegen"
-
-#. module: mail
-#: model:ir.actions.act_window,help:mail.mail_shortcode_action
-msgid "Click to define a new chat shortcode."
-msgstr "Klik om een nieuwe chat shortcode te definiëren."
-
-#. module: mail
 #: selection:mail.channel.partner,fold_state:0
 msgid "Closed"
 msgstr "Afgesloten"
@@ -1180,8 +1030,8 @@ msgid "Comma-separated ids of recipient partners"
 msgstr "Komma gescheiden ids van de ontvangende relaties"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_partner_to
-#: model:ir.model.fields,help:mail.field_mail_template_partner_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr ""
@@ -1194,8 +1044,8 @@ msgid "Comma-separated recipient addresses"
 msgstr "Komma gescheiden  adressen van de ontvangende"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,help:mail.field_mail_template_email_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,help:mail.field_mail_template__email_to
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr ""
 "Komma-gescheiden ontvanger adressen (tijdelijke aanduidingen kunnen hier "
@@ -1216,8 +1066,8 @@ msgid "Compose Email"
 msgstr "Email opstellen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_composition_mode
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__composition_mode
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__composition_mode
 msgid "Composition mode"
 msgstr "Bewerkmodus"
 
@@ -1228,14 +1078,14 @@ msgstr "Configureer uw soorten activiteiten"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:109
+#: code:addons/mail/static/src/xml/thread.xml:114
 #, python-format
 msgid "Congratulations, your inbox is empty"
 msgstr "Proficiat, uw inbox is leeg"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:647
+#: code:addons/mail/static/src/js/discuss.js:662
 #, python-format
 msgid "Congratulations, your inbox is empty!"
 msgstr "Gefeliciteerd, uw inbox is leeg!"
@@ -1252,20 +1102,20 @@ msgid "Content"
 msgstr "Inhoud"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_body
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body
-#: model:ir.model.fields,field_description:mail.field_mail_message_body
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_body
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__body
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body
+#: model:ir.model.fields,field_description:mail.field_mail_message__body
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__body
 msgid "Contents"
 msgstr "Inhoud"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_fold_state
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__fold_state
 msgid "Conversation Fold State"
 msgstr "Conversatie gevouwen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_minimized
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_minimized
 msgid "Conversation is minimized"
 msgstr "Conversatie is verkleind"
 
@@ -1277,64 +1127,70 @@ msgid "Conversations"
 msgstr "Conversaties"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,help:mail.field_res_users_message_bounce
+#: model:ir.model.fields,help:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,help:mail.field_res_users__message_bounce
 msgid "Counter of the number of bounced emails for this contact"
 msgstr "Teller met het aantal niet-afgeleverde e-mails voor dit contact"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:307
+#: code:addons/mail/static/src/js/discuss.js:318
 #, python-format
 msgid "Create %s"
 msgstr "Aanmaken %s"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__create_date
 msgid "Create Date"
 msgstr "Aanmaakdatum"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:350
+#, python-format
+msgid "Create a new %(document)s"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Created By"
 msgstr "Aangemaakt door"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_uid
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_uid
 msgid "Created by"
 msgstr "Aangemaakt door"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:41
-#: 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
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_date
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_date
 #, python-format
 msgid "Created on"
 msgstr "Aangemaakt op"
@@ -1345,91 +1201,23 @@ msgid "Creation Month"
 msgstr "Aanmaak maand"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,help:mail.field_mail_mail_starred
-#: model:ir.model.fields,help:mail.field_mail_message_starred
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_starred
+#: model:ir.model.fields,help:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,help:mail.field_mail_mail__starred
+#: model:ir.model.fields,help:mail.field_mail_message__starred
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__starred
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "De huidige gebruiker heeft een ster notificatie gekoppeld aan dit bericht."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_date
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__date
+#: model:ir.model.fields,field_description:mail.field_mail_message__date
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__date
 msgid "Date"
 msgstr "Datum"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,help:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,help:mail.field_event_event_message_last_post
-#: model:ir.model.fields,help:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,help:mail.field_event_track_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_track_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
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,help:mail.field_note_note_message_last_post
-#: model:ir.model.fields,help:mail.field_product_product_message_last_post
-#: model:ir.model.fields,help:mail.field_product_template_message_last_post
-#: model:ir.model.fields,help:mail.field_project_project_message_last_post
-#: model:ir.model.fields,help:mail.field_project_task_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,help:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,help:mail.field_res_users_message_last_post
-#: model:ir.model.fields,help:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,help:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr "Datum van het laatste bericht verstuurt op deze regel."
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Deadline"
 msgstr "Deadline"
@@ -1440,32 +1228,32 @@ msgid "Dear"
 msgstr "Beste"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__default
 msgid "Default"
 msgstr "Standaard"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,field_description:mail.field_mail_template_null_value
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,field_description:mail.field_mail_template__null_value
 msgid "Default Value"
 msgstr "Standaardwaarde"
 
 #. module: mail
-#: 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_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
 msgid "Default Values"
 msgstr "Standaardwaarden"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__use_default_to
 msgid "Default recipients"
 msgstr "Standaard ontvangers"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,help:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,help:mail.field_mail_template__use_default_to
 msgid ""
 "Default recipients of the record:\n"
 "- partner (using id on a partner or the partner_id field) OR\n"
@@ -1476,26 +1264,31 @@ msgstr ""
 "- e-mail (gebruik makende van het email_from veld)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.actions.act_window,help:mail.mail_shortcode_action
+msgid "Define a new chat shortcode"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete Emails"
 msgstr "Verwijderen emails"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete_message
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete_message
 msgid "Delete Message Copy"
 msgstr "Verwijder bericht kopie"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete sent emails (mass mailing only)"
 msgstr "Verwijder verzonden e-mails (alleen bulk mailingen)"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:320
+#: code:addons/mail/static/src/xml/thread.xml:325
 #, python-format
 msgid "Delete this attachment"
 msgstr "Verwijder deze bijlage"
@@ -1506,15 +1299,15 @@ msgid "Delivery Failed"
 msgstr "Afleveren mislukt"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_description
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_description
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_description
+#: model:ir.model.fields,field_description:mail.field_mail_channel__description
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__description
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__description
 #: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
 msgid "Description"
 msgstr "Omschrijving"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_description
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__description
 msgid ""
 "Description that will be added in the message posted for this subtype. If "
 "void, the name will be added instead."
@@ -1524,7 +1317,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:46
+#: code:addons/mail/static/src/xml/discuss.xml:46
 #, python-format
 msgid "Direct Messages"
 msgstr "Directe berichten"
@@ -1555,26 +1348,26 @@ msgid "Discussions"
 msgstr "Discussies"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_display_name
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__display_name
+#: 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_subtype__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_notification__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_thread__display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__display_name
 msgid "Display Name"
 msgstr "Schermnaam"
 
@@ -1588,13 +1381,13 @@ msgstr ""
 "openen met dit sjabloon"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_res_name
+#: model:ir.model.fields,help:mail.field_mail_activity__res_name
 msgid "Display name of the related document."
 msgstr "Schermnaam van het gerelateerd document."
 
 #. 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
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete_message
 msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
@@ -1608,7 +1401,12 @@ msgid "Document Followers"
 msgstr "Document volgers"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_name
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_model_id
+msgid "Document Model"
+msgstr "Document Model"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_name
 msgid "Document Name"
 msgstr "Documentnaam"
 
@@ -1629,28 +1427,28 @@ msgstr "Voltooid & Plan volgende in"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:296
+#: code:addons/mail/static/src/xml/thread.xml:301
 #, python-format
 msgid "Download this PDF"
 msgstr "Download deze PDF"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:272
-#: code:addons/mail/static/src/xml/thread.xml:285
-#: code:addons/mail/static/src/xml/thread.xml:308
+#: code:addons/mail/static/src/xml/thread.xml:277
+#: code:addons/mail/static/src/xml/thread.xml:290
+#: code:addons/mail/static/src/xml/thread.xml:313
 #, python-format
 msgid "Download this attachment"
 msgstr "Download deze bijlage"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity__date_deadline
 msgid "Due Date"
 msgstr "Vervaldatum"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:37
+#: code:addons/mail/static/src/js/activity.js:94
 #, python-format
 msgid "Due in %d days"
 msgstr "Te betalen in %d dagen"
@@ -1682,7 +1480,7 @@ msgid "Edit subscription"
 msgstr "Bijwerken aanmelding"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_email
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_email
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 #: model:mail.activity.type,name:mail.mail_activity_data_email
 #: selection:mail.compose.message,message_type:0
@@ -1717,12 +1515,12 @@ msgid "Email Search"
 msgstr "Email zoeken"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_email_status
+#: model:ir.model.fields,field_description:mail.field_mail_notification__email_status
 msgid "Email Status"
 msgstr "E-mail status"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__template_id
 msgid "Email Template"
 msgstr "E-mailsjabloon"
 
@@ -1742,7 +1540,7 @@ msgid "Email Thread"
 msgstr "E-mail discussie"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_alias_id
+#: model:ir.model.fields,help:mail.field_res_users__alias_id
 msgid ""
 "Email address internally associated with this user. Incoming emails will "
 "appear in the user's notifications."
@@ -1751,10 +1549,10 @@ msgstr ""
 "e-mails worden weergegeven in de gebruikers notificaties."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_email_from
-#: model:ir.model.fields,help:mail.field_mail_mail_email_from
-#: model:ir.model.fields,help:mail.field_mail_message_email_from
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,help:mail.field_mail_compose_message__email_from
+#: model:ir.model.fields,help:mail.field_mail_mail__email_from
+#: model:ir.model.fields,help:mail.field_mail_message__email_from
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__email_from
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found and replaces the author_id field in the chatter."
@@ -1793,7 +1591,7 @@ msgid "Error during communication with the publisher warranty server."
 msgstr "Fout tijdens communicatie met de uitgevers garantie server."
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:302
+#: code:addons/mail/models/mail_mail.py:300
 #, python-format
 msgid ""
 "Error without exception. Probably due do sending an email without computed "
@@ -1835,7 +1633,7 @@ msgid "Extended Filters..."
 msgstr "Uitgebreide filters..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_fail_counter
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__fail_counter
 msgid "Fail Mail"
 msgstr "Mislukte mail"
 
@@ -1845,19 +1643,19 @@ msgid "Failed"
 msgstr "Mislukt"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:374
+#: code:addons/mail/models/mail_template.py:368
 #, python-format
 msgid "Failed to render template %r using values %r"
 msgstr "Mislukt om template te renderen %r met gebruik van de waardes %r"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,field_description:mail.field_mail_mail__failure_reason
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Failure Reason"
 msgstr "Reden mislukt"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
 msgid ""
 "Failure reason. This is usually the exception thrown by the email server, "
 "stored to ease the debugging of mailing issues."
@@ -1867,45 +1665,45 @@ msgstr ""
 "te lossen."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred_partner_ids
 msgid "Favorited By"
 msgstr "Favoriet op"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:215
-#: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
+#: code:addons/mail/static/src/js/activity.js:245
+#: model:ir.model.fields,field_description:mail.field_mail_activity__feedback
 #, python-format
 msgid "Feedback"
 msgstr "Feedback"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_object_field
 msgid "Field"
 msgstr "Veld"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:24
+#: code:addons/mail/models/ir_model.py:30
 #, python-format
 msgid "Field \"Mail Thread\" cannot be changed to \"False\"."
 msgstr "Veld \"Mail Tread\" kan niet worden ingesteld op \"False\"."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_desc
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_desc
 msgid "Field Description"
 msgstr "Omschrijving veld"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_type
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_type
 msgid "Field Type"
 msgstr "Soort veld"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__relation_field
 msgid ""
 "Field used to link the related model to the subtype model when using "
 "automatic subscription on a related document. The field is used to compute "
@@ -1922,8 +1720,8 @@ msgid "Fields"
 msgstr "Velden"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,help:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,help:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,help:mail.field_mail_template__copyvalue
 msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
@@ -1938,7 +1736,6 @@ msgstr "Gevouwen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:696
 #: code:addons/mail/static/src/xml/followers.xml:20
 #, python-format
 msgid "Follow"
@@ -1946,208 +1743,211 @@ msgstr "Volgen"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_followers
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_follower_ids
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: model:ir.ui.view,arch_db:mail.view_followers_tree
 msgid "Followers"
 msgstr "Volgers"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_channel_ids
 msgid "Followers (Channels)"
 msgstr "Volgers (Kanalen)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_partner_ids
 msgid "Followers (Partners)"
 msgstr "Volgers (Partners)"
 
@@ -2176,18 +1976,18 @@ msgid "Following"
 msgstr "Volgend"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_icon
-#: model:ir.model.fields,help:mail.field_mail_activity_type_icon
+#: 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 "Font awesome icoon b.v. fa-tasks"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_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
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_from
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_from
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__email_from
 msgid "From"
 msgstr "Van"
 
@@ -2210,7 +2010,7 @@ msgid "Gateway"
 msgstr "Gateway"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:55
+#: code:addons/mail/models/res_users.py:54
 #, python-format
 msgid "Go to the configuration panel"
 msgstr "Ga naar het configuratie paneel"
@@ -2253,49 +2053,54 @@ msgid "Has attachments"
 msgstr "Heeft bijlage"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_headers
+#: model:ir.model.fields,field_description:mail.field_mail_mail__headers
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Headers"
 msgstr "Kopteksten"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_hidden
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Hello"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
 msgid "Hidden"
 msgstr "Verborgen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_hidden
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__hidden
 msgid "Hide the subtype in the follower options"
 msgstr "Verberg het subtype in de volgers opties"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_id
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__id
+#: 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_subtype__id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__id
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__id
+#: model:ir.model.fields,field_description:mail.field_mail_template__id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__id
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mail
-#: 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_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
 msgid ""
 "ID of the parent record holding the alias (example: project holding the task"
 " creation alias)"
@@ -2304,163 +2109,165 @@ msgstr ""
 "project bezit de alias van de aangemaakte taken)"
 
 #. 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
+#: 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 "Icon"
 
 #. 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
+#: 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"
 msgstr "Id van de gevolgde resource"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:119
-#: code:addons/mail/static/src/xml/client_action.xml:203
+#: code:addons/mail/static/src/xml/discuss.xml:119
+#: code:addons/mail/static/src/xml/discuss.xml:203
 #, python-format
 msgid "Idle"
 msgstr "Inactief"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,help:mail.field_event_event_message_unread
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread
-#: model:ir.model.fields,help:mail.field_event_track_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,help:mail.field_note_note_message_unread
-#: model:ir.model.fields,help:mail.field_product_product_message_unread
-#: model:ir.model.fields,help:mail.field_product_template_message_unread
-#: model:ir.model.fields,help:mail.field_project_project_message_unread
-#: model:ir.model.fields,help:mail.field_project_task_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread
-#: model:ir.model.fields,help:mail.field_res_users_message_unread
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,help:mail.field_event_event__message_unread
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread
+#: model:ir.model.fields,help:mail.field_event_track__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,help:mail.field_note_note__message_unread
+#: model:ir.model.fields,help:mail.field_product_product__message_unread
+#: model:ir.model.fields,help:mail.field_product_template__message_unread
+#: model:ir.model.fields,help:mail.field_project_project__message_unread
+#: model:ir.model.fields,help:mail.field_project_task__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread
+#: model:ir.model.fields,help:mail.field_res_users__message_unread
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread
 msgid "If checked new messages require your attention."
 msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,help:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction
 msgid "If checked, new messages require your attention."
 msgstr "Indien aangevinkt vragen nieuwe berichten uw aandacht."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
 msgid ""
 "If checked, the partners will receive an email warning they have been added "
 "in the document's followers."
@@ -2469,8 +2276,8 @@ msgstr ""
 "toegevoegd aan het document."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,help:mail.field_mail_template_user_signature
+#: model:ir.model.fields,help:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,help:mail.field_mail_template__user_signature
 msgid ""
 "If checked, the user's signature will be appended to the text version of the"
 " message"
@@ -2479,8 +2286,8 @@ msgstr ""
 "de tekst-versie van het bericht"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_opt_out
-#: model:ir.model.fields,help:mail.field_res_users_opt_out
+#: model:ir.model.fields,help:mail.field_res_partner__opt_out
+#: model:ir.model.fields,help:mail.field_res_users__opt_out
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails for mass "
 "mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
@@ -2492,7 +2299,7 @@ msgstr ""
 "maken van een bulk-mailing."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_mail__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible."
@@ -2501,8 +2308,8 @@ msgstr ""
 "niet ingesteld, zal de e-mail zo snel mogelijk worden verstuurd."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_scheduled_date
-#: model:ir.model.fields,help:mail.field_mail_template_scheduled_date
+#: model:ir.model.fields,help:mail.field_email_template_preview__scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_template__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible. Jinja2 placeholders may be used."
@@ -2512,7 +2319,7 @@ msgstr ""
 "Jinja2 placeholders kunnen worden gebruikt."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
 msgid ""
 "If you have setup a catch-all email domain redirected to the Odoo server, "
 "enter the domain name here."
@@ -2521,26 +2328,26 @@ msgstr ""
 "Odoo server, vul dan hier de domein naam in."
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:141
+#: code:addons/mail/models/mail_alias.py:130
 #, python-format
 msgid "Inactive Alias"
 msgstr "Inactieve alias"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:655
-#: code:addons/mail/static/src/xml/client_action.xml:22
-#: code:addons/mail/static/src/xml/client_action.xml:154
-#: code:addons/mail/static/src/xml/client_action.xml:164
+#: code:addons/mail/static/src/js/services/chat_manager.js:84
+#: code:addons/mail/static/src/xml/discuss.xml:22
+#: code:addons/mail/static/src/xml/discuss.xml:154
+#: code:addons/mail/static/src/xml/discuss.xml:164
 #, python-format
 msgid "Inbox"
 msgstr "Postvak in"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,help:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,help:mail.field_mail_message_parent_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,help:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,help:mail.field_mail_message__parent_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__parent_id
 msgid "Initial thread message."
 msgstr "Initiële bericht thread"
 
@@ -2551,12 +2358,12 @@ msgid "Integrations"
 msgstr "integraties"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__internal
 msgid "Internal Only"
 msgstr "Alleen intern"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:99
+#: code:addons/mail/models/mail_alias.py:88
 #, python-format
 msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
@@ -2566,7 +2373,8 @@ msgstr ""
 "zijn, bijvoorbeeld:  \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1794
+#: code:addons/mail/models/mail_thread.py:1811
+#: code:addons/mail/models/mail_thread.py:1996
 #, python-format
 msgid ""
 "Invalid record set: should be called as model (without records) or on "
@@ -2576,14 +2384,14 @@ msgstr ""
 "op één recordset"
 
 #. module: mail
-#: code:addons/mail/controllers/main.py:41
+#: code:addons/mail/controllers/main.py:40
 #, python-format
 msgid "Invalid token in route %s"
 msgstr "Ongeldige token in route %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "Invitation"
 msgstr "Uitnodiging"
@@ -2596,8 +2404,8 @@ msgstr "Uitnodiging om te volgen %s: %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:44
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:44
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite"
 msgstr "Uitnodigen"
@@ -2611,15 +2419,15 @@ msgstr "Volger uitnodigen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:31
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:29
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite people"
 msgstr "Mensen uitnodigen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:867
+#: code:addons/mail/static/src/js/discuss.js:882
 #, python-format
 msgid "Invite people to #%s"
 msgstr "Nodig mensen uit io #%s"
@@ -2635,95 +2443,96 @@ msgid "Invited people only"
 msgstr "Enkel uitgenodigde mensen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_note_note_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_product_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_template_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_project_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_task_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_users_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_note_note__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_product__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_template__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_project__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_task__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_users__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_is_follower
 msgid "Is Follower"
 msgstr "Is een volger"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification
+#: model:ir.model.fields,field_description:mail.field_mail_mail__notification
 msgid "Is Notification"
 msgstr "Is melding"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_read
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_read
 msgid "Is Read"
 msgstr "Is gelezen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_subscribed
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_subscribed
 msgid "Is Subscribed"
 msgstr "Is ingeschreven"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_member
 msgid "Is a member"
 msgstr "Is een lid"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
 msgid "Is pinned on the interface"
 msgstr "Is gespeld op de interface"
 
@@ -2738,144 +2547,76 @@ msgid "Join a group"
 msgstr "Word lid van een groep"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_lang
-#: model:ir.model.fields,field_description:mail.field_mail_template_lang
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__lang
+#: model:ir.model.fields,field_description:mail.field_mail_template__lang
 msgid "Language"
 msgstr "Taal"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_track_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_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_test_simple_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_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
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,field_description:mail.field_note_note_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_product_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_template_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_project_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_task_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_users_message_last_post
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_last_post
-msgid "Last Message Date"
-msgstr "Laatste bericht datum"
-
-#. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner___last_update
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message___last_update
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract___last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message____last_update
+#: 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_subtype____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_notification____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_template____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_thread____last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract____last_update
 msgid "Last Modified on"
 msgstr "Laatst gewijzigd op"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_last_seen_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_seen_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_last_seen_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__seen_message_id
 msgid "Last Seen"
 msgstr "Laatst gezien"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_uid
-#: 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_tracking_value_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_date
-#: 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_tracking_value_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
@@ -2899,14 +2640,14 @@ msgstr "Verlof"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:687
-#: code:addons/mail/static/src/xml/client_action.xml:112
+#: code:addons/mail/models/mail_channel.py:693
+#: code:addons/mail/static/src/xml/discuss.xml:112
 #, python-format
 msgid "Leave this channel"
 msgstr "Verlaat dit kanaal"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_channel_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__channel_ids
 msgid ""
 "List of channels that will be added as listeners of the current document."
 msgstr ""
@@ -2914,7 +2655,7 @@ msgstr ""
 "document."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__partner_ids
 msgid ""
 "List of partners that will be added as follower of the current document."
 msgstr ""
@@ -2922,18 +2663,18 @@ msgstr ""
 "document."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:698
+#: code:addons/mail/models/mail_channel.py:704
 #, python-format
 msgid "List users in the current channel"
 msgstr "Lijst van gebruikers in het huidige kanaal"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__channel_id
 msgid "Listener"
 msgstr "Luisteraar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_partner_ids
 msgid "Listeners"
 msgstr "Luisteraars"
 
@@ -2949,7 +2690,7 @@ msgstr "Live chat"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:31
+#: code:addons/mail/static/src/js/chatter_composer.js:30
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Log"
@@ -2973,8 +2714,8 @@ msgid "Log an Activity"
 msgstr "Log een activiteit"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__is_log
 msgid "Log an Internal Note"
 msgstr "Maak een interne notitie"
 
@@ -2993,10 +2734,10 @@ msgid "Log or schedule an activity"
 msgstr "Log of plan een activiteit"
 
 #. 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
+#: 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 "Mail activiteit soort"
 
@@ -3006,13 +2747,13 @@ msgid "Mail Channel Form"
 msgstr "Mailkanaal formulier"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:369
+#: code:addons/mail/models/mail_mail.py:367
 #, python-format
 msgid "Mail Delivery Failed"
 msgstr "E-mail afleveren mislukt"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,field_description:mail.field_ir_model__is_mail_thread
 #: model:ir.ui.view,arch_db:mail.model_search_view
 msgid "Mail Thread"
 msgstr "E-mail discussie"
@@ -3023,7 +2764,7 @@ msgid "Mail Tracking Value"
 msgstr "Mail traceerwaarde"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_notification
+#: model:ir.model.fields,help:mail.field_mail_mail__notification
 msgid "Mail has been created to notify people of an existing mail.message"
 msgstr ""
 "E-mail is aangemaakt om mensen op de hoogte te brengen van een bestaande "
@@ -3037,7 +2778,7 @@ msgid "Mail: Email Queue Manager"
 msgstr "Mail: E-mail wachtrij manager"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:832
+#: code:addons/mail/models/mail_thread.py:813
 #, python-format
 msgid "Mailbox unavailable - %s"
 msgstr "Mailbox onbeschikbaar - %s"
@@ -3056,14 +2797,14 @@ msgstr "Markeer als gereed"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all as read"
 msgstr "Markeer alles als gelezen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all read"
 msgstr "Markeer alles als gelezen"
@@ -3075,15 +2816,15 @@ msgstr "Markeer als gereed"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:206
+#: code:addons/mail/static/src/xml/thread.xml:211
 #, python-format
 msgid "Mark as Read"
 msgstr "Markeer als gelezen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:153
-#: code:addons/mail/static/src/xml/thread.xml:200
+#: code:addons/mail/static/src/xml/thread.xml:158
+#: code:addons/mail/static/src/xml/thread.xml:205
 #, python-format
 msgid "Mark as Todo"
 msgstr "Zet op gereed voor uitvoeren"
@@ -3096,12 +2837,12 @@ msgid "Mark as done"
 msgstr "Markeer als gereed"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_medium
 msgid "Medium-sized photo"
 msgstr "Middelgrote afbeelding"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,help:mail.field_mail_channel__image_medium
 msgid ""
 "Medium-sized photo of the group. It is automatically resized as a 128x128px "
 "image, with aspect ratio preserved. Use this field in form views or some "
@@ -3123,7 +2864,7 @@ msgid "Members"
 msgstr "Leden"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,help:mail.field_mail_channel__group_ids
 msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
@@ -3132,16 +2873,22 @@ msgstr ""
 "zelfstandig hun lidmaatschap beheren als dat nodig is."
 
 #. module: mail
+#: code:addons/mail/wizard/base_partner_merge.py:13
+#, python-format
+msgid "Merged with the following partners:"
+msgstr "Samengevoegd met de volgende relaties:"
+
+#. 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.model.fields,field_description:mail.field_mail_mail__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Message"
 msgstr "Bericht"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
 msgid "Message ID"
 msgstr "Bericht-ID"
 
@@ -3151,37 +2898,37 @@ msgid "Message Notifications"
 msgstr "Berichten notificaties"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_mail__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_message__record_name
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__record_name
 msgid "Message Record Name"
 msgstr "Bericht veldnaam"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__name
 msgid "Message Type"
 msgstr "Bericht type"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_to
+#: model:ir.model.fields,help:mail.field_mail_mail__email_to
 msgid "Message recipients (emails)"
 msgstr "Bericht ontvangers (e-mails)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_references
+#: model:ir.model.fields,help:mail.field_mail_mail__references
 msgid "Message references, such as identifiers of previous messages"
 msgstr "Bericht referenties, zoals identifiers van vorige berichten"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
+#: code:addons/mail/static/src/xml/discuss.xml:124
 #, python-format
 msgid "Message sent in \""
 msgstr "Bericht verstuurd in \""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__name
 msgid ""
 "Message subtype gives a more precise type on the message, especially for "
 "system notifications. For example, it can be a notification related to a new"
@@ -3201,7 +2948,7 @@ msgid "Message subtypes"
 msgstr "Bericht subtypen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_followers_subtype_ids
+#: model:ir.model.fields,help:mail.field_mail_followers__subtype_ids
 msgid ""
 "Message subtypes followed, meaning subtypes that will be pushed onto the "
 "user's Wall."
@@ -3210,10 +2957,10 @@ msgstr ""
 "bij de gebruikers berichten."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,help:mail.field_mail_mail_message_type
-#: model:ir.model.fields,help:mail.field_mail_message_message_type
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,help:mail.field_mail_mail__message_type
+#: model:ir.model.fields,help:mail.field_mail_message__message_type
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_type
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
@@ -3222,87 +2969,88 @@ msgstr ""
 "commentaar voor andere berichten zoals gebruiker beantwoord"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,help:mail.field_mail_mail_message_id
-#: model:ir.model.fields,help:mail.field_mail_message_message_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,help:mail.field_mail_mail__message_id
+#: model:ir.model.fields,help:mail.field_mail_message__message_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_id
 msgid "Message unique identifier"
 msgstr "Bericht unieke identifier"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_id
 msgid "Message-Id"
 msgstr "Bericht-Id"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_ids
 #: model:ir.ui.menu,name:mail.menu_mail_message
 #: model:ir.ui.view,arch_db:mail.view_message_tree
 msgid "Messages"
@@ -3323,7 +3071,7 @@ msgstr ""
 "later nog wilt bekijken."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__internal
 msgid ""
 "Messages with internal subtypes will be visible only by employees, aka "
 "members of base_user group"
@@ -3332,20 +3080,20 @@ msgstr ""
 "personeelsleden (ook gekend als leden van de base_user group)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_res_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_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
 msgid "Model"
 msgstr "Model"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_res_model
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__res_model
 msgid "Model of the followed resource"
 msgstr "Model van de gevolgde bron"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__res_model
 msgid ""
 "Model the subtype applies to. If False, this subtype applies to all models."
 msgstr ""
@@ -3374,25 +3122,25 @@ msgid "My Activities"
 msgstr "Mijn activiteiten"
 
 #. 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_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.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Name"
 msgstr "Naam"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_record_name
-#: model:ir.model.fields,help:mail.field_mail_mail_record_name
-#: model:ir.model.fields,help:mail.field_mail_message_record_name
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,help:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,help:mail.field_mail_mail__record_name
+#: model:ir.model.fields,help:mail.field_mail_message__record_name
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__record_name
 msgid "Name get of the related document."
 msgstr "Verkrijg naam van het gerelateerde document."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,help:mail.field_mail_template_report_name
+#: model:ir.model.fields,help:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,help:mail.field_mail_template__report_name
 msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
@@ -3401,71 +3149,71 @@ msgstr ""
 "De verlenging kan worden weggelaten en zal dan uit het rapporttype worden afgeleid."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_mail_needaction
-#: model:ir.model.fields,help:mail.field_mail_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_mail__needaction
+#: model:ir.model.fields,help:mail.field_mail_message__needaction
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__needaction
 #: model:ir.ui.view,arch_db:mail.view_message_search
 msgid "Need Action"
 msgstr "Vereist actie"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_res_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
 msgid "Needaction Recipient"
 msgstr "Vraagt om actie ontvanger"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:138
+#: code:addons/mail/static/src/xml/discuss.xml:138
 #, python-format
 msgid "New Channel"
 msgstr "Nieuw kanaal"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:137
+#: code:addons/mail/static/src/xml/discuss.xml:137
 #, python-format
 msgid "New Message"
 msgstr "Nieuw bericht"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_char
 msgid "New Value Char"
 msgstr "Oude waarde Char"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_datetime
 msgid "New Value Datetime"
 msgstr "Nieuwe waarde datum"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_float
 msgid "New Value Float"
 msgstr "Nieuwe waarde float"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_integer
 msgid "New Value Integer"
 msgstr "Nieuwe waarde integer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_monetary
 msgid "New Value Monetary"
 msgstr "Niuewe waarde valuta"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_text
 msgid "New Value Text"
 msgstr "Nieuwe waarde tekst"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:55
-#: code:addons/mail/static/src/js/window_manager.js:139
+#: code:addons/mail/static/src/js/services/chat_manager.js:1625
+#: code:addons/mail/static/src/js/services/chat_window_manager.js:283
 #: code:addons/mail/static/src/xml/systray.xml:12
 #: code:addons/mail/static/src/xml/systray.xml:21
 #, python-format
@@ -3474,21 +3222,21 @@ msgstr "Nieuw bericht"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:233
+#: code:addons/mail/static/src/xml/thread.xml:238
 #, python-format
 msgid "New messages"
 msgstr "Nieuwe berichten"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:110
+#: code:addons/mail/static/src/xml/thread.xml:115
 #, python-format
 msgid "New messages appear here."
 msgstr "Nieuwe berichten verschijnen hier."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:97
+#: code:addons/mail/static/src/js/discuss.js:99
 #, python-format
 msgid "New people"
 msgstr "Nieuwe persoon"
@@ -3499,85 +3247,85 @@ msgid "Next Activities"
 msgstr "Volgende activiteiten"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_date_deadline
 msgid "Next Activity Deadline"
 msgstr "Volgende activiteit deadline"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_summary
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_summary
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_summary
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_summary
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_summary
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_summary
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_summary
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_summary
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_summary
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_summary
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_summary
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_summary
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_summary
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_summary
 msgid "Next Activity Summary"
 msgstr "Omschrijving volgende actie"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_type_id
 msgid "Next Activity Type"
 msgstr "Volgende activiteit type"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,field_description:mail.field_mail_activity__has_recommended_activities
 msgid "Next activities available"
 msgstr "Volgende activiteiten beschikbaar"
 
@@ -3621,28 +3369,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:113
+#: code:addons/mail/static/src/xml/thread.xml:118
 #, python-format
 msgid "No starred message"
 msgstr "Geen berichten met ster."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__no_auto_thread
 msgid "No threading for answers"
 msgstr "Geen berichten voor antwoorden"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_note
+#: model:ir.model.fields,field_description:mail.field_mail_activity__note
 #: model:mail.message.subtype,name:mail.mt_note
 msgid "Note"
 msgstr "Notitie"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:157
+#: code:addons/mail/static/src/xml/thread.xml:162
 #, python-format
 msgid "Note by"
 msgstr "Opmerking door"
@@ -3653,100 +3401,101 @@ msgid "Notification"
 msgstr "Melding"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_users_notification_type
+#: model:ir.model.fields,field_description:mail.field_res_users__notification_type
 msgid "Notification Management"
 msgstr "Notificatiebeheer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_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 "Notificaties"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers"
 msgstr "Meld volgers"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_notify
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_notify
+#: model:ir.model.fields,help:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers of the document (mass post only)"
 msgstr "Meld aan volgers van dit document (alleen bulk bericht)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of Actions"
 msgstr "Aantal acties"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_days
+#: 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."
@@ -3755,149 +3504,153 @@ msgstr ""
 "deadline van uw actie in te plannen."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_payment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of messages which requires an action"
 msgstr "Aantal berichten die actie vereisen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread_counter
 msgid "Number of unread messages"
 msgstr "Aantal ongelezen berichten"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model:ir.ui.view,arch_db:mail.message_notification_email
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Odoo"
 msgstr "Odoo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:895
+#: code:addons/mail/static/src/js/discuss.js:910
 #, python-format
 msgid ""
 "Odoo has now the permission to send you native notifications on this device."
@@ -3906,14 +3659,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "Odoo needs your permission to"
 msgstr "Odoo heeft uw toestemming nodig om"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:892
+#: code:addons/mail/static/src/js/discuss.js:907
 #, python-format
 msgid ""
 "Odoo will not have the permission to send native notifications on this "
@@ -3923,38 +3676,38 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:120
+#: code:addons/mail/static/src/xml/discuss.xml:120
 #, python-format
 msgid "Offline"
 msgstr "Offline"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_char
 msgid "Old Value Char"
 msgstr "Oude waarde Char"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_datetime
 msgid "Old Value DateTime"
 msgstr "Oude waarde datum"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_float
 msgid "Old Value Float"
 msgstr "Oude waarde float"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_integer
 msgid "Old Value Integer"
 msgstr "Oude waarde integer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_monetary
 msgid "Old Value Monetary"
 msgstr "Oude waarde valuta"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_text
 msgid "Old Value Text"
 msgstr "Oude waarde text"
 
@@ -3983,14 +3736,14 @@ msgstr "Één volger"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:118
-#: code:addons/mail/static/src/xml/client_action.xml:202
+#: code:addons/mail/static/src/xml/discuss.xml:118
+#: code:addons/mail/static/src/xml/discuss.xml:202
 #, python-format
 msgid "Online"
 msgstr "Online"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:22
+#: code:addons/mail/models/ir_model.py:28
 #, python-format
 msgid "Only custom models can be modified."
 msgstr "Alleen aangepaste modellen kunnen worden veranderd"
@@ -4012,14 +3765,14 @@ msgstr "Open bovenliggend document"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Open channel settings"
 msgstr "Open kanaal instellingen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:187
+#: code:addons/mail/static/src/xml/discuss.xml:187
 #, python-format
 msgid "Open chat"
 msgstr "Open chat"
@@ -4032,15 +3785,15 @@ msgid "Open in Discuss"
 msgstr "Open in discussieer"
 
 #. 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
+#: 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"
 msgstr "Opt-Out"
 
 #. module: mail
-#: 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_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
 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 "
@@ -4051,8 +3804,8 @@ msgstr ""
 "dit het aanmaken van nieuwe records uitzetten."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,help:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,help:mail.field_mail_template__mail_server_id
 msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
@@ -4061,14 +3814,14 @@ msgstr ""
 " degene met de hoogste prioriteit worden gebruikt."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_template
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_template
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_template
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_template
 msgid "Optional report to print and attach"
 msgstr "Optioneel rapport om af te drukken en te koppelen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_lang
-#: model:ir.model.fields,help:mail.field_mail_template_lang
+#: model:ir.model.fields,help:mail.field_email_template_preview__lang
+#: model:ir.model.fields,help:mail.field_mail_template__lang
 msgid ""
 "Optional translation language (ISO code) to select when sending out an "
 "email. If not set, the english version will be used. This should usually be "
@@ -4081,8 +3834,8 @@ msgstr ""
 "${object.partner_id.lang}."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,help:mail.field_mail_template_null_value
+#: model:ir.model.fields,help:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,help:mail.field_mail_template__null_value
 msgid "Optional value to use if the target field is empty"
 msgstr "Optioneel veld om te gebruiken als het doel veld leeg is"
 
@@ -4097,8 +3850,8 @@ msgid "Outgoing"
 msgstr "Uitgaand"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__mail_server_id
 msgid "Outgoing Mail Server"
 msgstr "Uitgaande mailserver"
 
@@ -4108,10 +3861,10 @@ msgid "Outgoing Mails"
 msgstr "Uitgaande e-mails"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_server_id
 msgid "Outgoing mail server"
 msgstr "Uitgaande mailserver"
 
@@ -4125,12 +3878,12 @@ msgstr "Uitgaande mailserver"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4144,43 +3897,43 @@ msgid "Override author's email"
 msgstr "Overschrijven van auteurs e-mail adres"
 
 #. module: mail
-#: 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_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
 msgid "Owner"
 msgstr "Eigenaar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__parent_id
 msgid "Parent"
 msgstr "Bovenliggend"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__parent_id
 msgid "Parent Message"
 msgstr "Bovenliggend bericht"
 
 #. module: mail
-#: 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_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
 msgid "Parent Model"
 msgstr "Bovenliggend model"
 
 #. module: mail
-#: 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_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
 msgid "Parent Record Thread ID"
 msgstr "Parent Record Thread ID"
 
 #. module: mail
-#: 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_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
 msgid ""
 "Parent model holding the alias. The model holding the alias reference is not"
 " necessarily the model given by alias_model_id (example: project "
@@ -4190,7 +3943,7 @@ msgstr ""
 "is niet noodzakelijk het model wat wordt gegeven door alias_model_id (bijvoorbeeld: project (parent_model) en taak (model))"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__parent_id
 msgid ""
 "Parent subtype, used for automatic subscription. This field is not correctly"
 " named. For example on a project, the parent_id of project subtypes refers "
@@ -4219,43 +3972,43 @@ msgstr ""
 "bulk-mail campagne."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction_partner_ids
 msgid "Partners with Need Action"
 msgstr "Relaties met Nodige Actie"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_template__auto_delete
 msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 "Om ruimte te besparen, verwijder deze e-mail permanent na het versturen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:891
+#: code:addons/mail/static/src/js/discuss.js:906
 #, python-format
 msgid "Permission denied"
 msgstr "Toegang geweigerd"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:894
+#: code:addons/mail/static/src/js/discuss.js:909
 #, python-format
 msgid "Permission granted"
 msgstr "Toegang verleend"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image
 msgid "Photo"
 msgstr "Foto"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,field_description:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,field_description:mail.field_mail_template__copyvalue
 msgid "Placeholder Expression"
 msgstr "Tijdelijke aanduiding expressie"
 
@@ -4269,12 +4022,12 @@ msgstr "Tijdelijke aanduiding expressie"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4290,49 +4043,56 @@ msgid "Planned activities"
 msgstr "Geplande activiteiten"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__days
+msgid "Planned in"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:282
+#: code:addons/mail/static/src/xml/thread.xml:287
 #, python-format
 msgid "Play this video"
 msgstr "Speel deze video af"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:158
+#: code:addons/mail/static/src/js/chatter_composer.js:157
 #, python-format
 msgid "Please complete customer's informations"
 msgstr "Vul de volledige klantinformatie in"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:84
+#: code:addons/mail/static/src/js/many2many_tags_email.js:96
 #, python-format
 msgid "Please complete customer's informations and email"
 msgstr "Vul de klantinformatie en e-mail volledig in."
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Please contact us instead using"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Please, wait while the file is uploading."
 msgstr "Een ogenblik geduld a.u.b., het bestand wordt geupload."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_notification_type
+#: model:ir.model.fields,help:mail.field_res_users__notification_type
 msgid ""
 "Policy on how to handle Chatter notifications:\n"
-"- Emails: notifications are sent to your email\n"
-"- Odoo: notifications appear in your Odoo Inbox"
+"- Handle by Emails: notifications are sent to your email address\n"
+"- Handle in Odoo: notifications appear in your Odoo Inbox"
 msgstr ""
-"Beleid hoe om te gaan met chatter berichten:\n"
-"- E-mails: berichten worden verstuurt als e-mail\n"
-"- Odoo: berichten verschijnen in de Odoo inbox"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_alias_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_channel_alias_contact
-#: model:ir.model.fields,help:mail.field_res_users_alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_channel__alias_contact
+#: model:ir.model.fields,help:mail.field_res_users__alias_contact
 msgid ""
 "Policy to post a message on the document using the mailgateway.\n"
 "- everyone: everyone can post\n"
@@ -4345,12 +4105,13 @@ msgstr ""
 "-volgers: allen volgers van een bijbehorend document of volgers van gevolgde kanalen\n"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Powered by"
 msgstr "Aangeboden door"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_previous_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__previous_type_ids
 msgid "Preceding Activities"
 msgstr "Voorgaande activiteiten"
 
@@ -4360,8 +4121,8 @@ msgid "Preferred reply address"
 msgstr "Voorkeur antwoord adres"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,help:mail.field_mail_template_reply_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,help:mail.field_mail_template__reply_to
 msgid "Preferred response address (placeholders may be used here)"
 msgstr ""
 "Voorkeur reactieadres (tijdelijke aanduidingen kan hier worden gebruikt)"
@@ -4377,27 +4138,27 @@ msgid "Preview of"
 msgstr "Voorbeeld van"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_previous_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__previous_activity_type_id
 msgid "Previous Activity Type"
 msgstr "Vorige activiteitsoort"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_public
+#: model:ir.model.fields,field_description:mail.field_mail_channel__public
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Privacy"
 msgstr "Privacy"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:56
-#: code:addons/mail/static/src/xml/client_action.xml:176
+#: code:addons/mail/static/src/xml/discuss.xml:56
+#: code:addons/mail/static/src/xml/discuss.xml:176
 #, python-format
 msgid "Private Channels"
 msgstr "Privé kanalen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:848
+#: code:addons/mail/static/src/js/discuss.js:863
 #, python-format
 msgid "Public Channels"
 msgstr "Openbare kanalen"
@@ -4426,68 +4187,72 @@ msgid "Received"
 msgstr "Ontvangen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_id
 msgid "Recipient"
 msgstr "Ontvanger"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Recipients"
 msgstr "Ontvangers"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_recommended_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__recommended_activity_type_id
 msgid "Recommended Activity Type"
 msgstr "Aanbevolen activiteitensoort"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_next_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__next_type_ids
 msgid "Recommended Next Activities"
 msgstr "Aanbevolen volgende activiteit"
 
 #. module: mail
-#: 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_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
 msgid "Record Thread ID"
 msgstr "Record Thread ID"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_references
+#: model:ir.model.fields,field_description:mail.field_mail_mail__references
 msgid "References"
 msgstr "Referenties"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_res_id
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Regards,"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__res_id
 msgid "Related Document ID"
 msgstr "Gerelateerde document ID"
 
 #. 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_mail_model
-#: model:ir.model.fields,field_description:mail.field_mail_message_model
-#: model:ir.model.fields,field_description:mail.field_mail_template_model
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_model
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_model
+#: 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_compose_message__model
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_model
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__model
 msgid "Related Document Model"
 msgstr "Gerelateerde document model"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_model
 msgid "Related Document Model Name"
 msgstr "Gerelateerde document model naam"
 
@@ -4497,12 +4262,12 @@ msgid "Related Message"
 msgstr "Gerelateerd bericht"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__partner_id
 msgid "Related Partner"
 msgstr "Gekoppelde relatie"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__relation_field
 msgid "Relation field"
 msgstr "Gerelateerd veld"
 
@@ -4521,63 +4286,63 @@ msgstr "Verwijder deze volger"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:203
+#: code:addons/mail/static/src/xml/thread.xml:208
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Reply"
 msgstr "Beantwoorden"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,help:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,help:mail.field_mail_message_reply_to
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,help:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,help:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,help:mail.field_mail_message__reply_to
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__reply_to
 msgid ""
 "Reply email address. Setting the reply_to bypasses the automatic thread "
 "creation."
 msgstr "Antwoord e-mail adres."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_reply_to
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__reply_to
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__reply_to
 msgid "Reply-To"
 msgstr "Antwoord aan"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_name
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_name
 msgid "Report Filename"
 msgstr "Bestandsnaam overzicht"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_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 "Verantwoordelijke"
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_user_id
+msgid "Responsible User"
+msgstr "Verantwoordelijke gebruiker"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
@@ -4586,12 +4351,12 @@ msgid "Retry"
 msgstr "Opnieuw proberen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body_html
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body_html
 msgid "Rich-text Contents"
 msgstr "Rich-tekst inhoud"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_body_html
+#: model:ir.model.fields,help:mail.field_mail_mail__body_html
 msgid "Rich-text/HTML message"
 msgstr "Rich-text/HTML bericht"
 
@@ -4601,7 +4366,7 @@ msgid "SMTP Server"
 msgstr "SMTP Server"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_res_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__res_id
 msgid "Sample Document"
 msgstr "Voorbeeld document"
 
@@ -4635,26 +4400,26 @@ msgid "Schedule activity"
 msgstr "Plan activiteit"
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:250
+#: code:addons/mail/models/mail_activity.py:260
 #, python-format
 msgid "Schedule an Activity"
 msgstr "Plan een activiteit"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:57
 #, python-format
 msgid "Schedule an activity"
 msgstr "Plan een activiteit in"
 
 #. 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
+#: 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"
 msgstr "Geplande datum"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__scheduled_date
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Scheduled Send Date"
 msgstr "Geplande verstuurdatum"
@@ -4670,8 +4435,8 @@ msgid "Search Groups"
 msgstr "Zoek groepen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__model_object_field
 msgid ""
 "Select target field from the related document model.\n"
 "If it is a relationship field you will be able to select a target field at the destination of the relationship."
@@ -4686,19 +4451,19 @@ msgstr "Geselecteerde groep van gebruikers"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:374
+#: code:addons/mail/static/src/js/composer.js:428
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Send"
 msgstr "Verzenden"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail
 msgid "Send Email"
 msgstr "Verzend e-mail"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:264
+#: code:addons/mail/models/mail_template.py:295
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Verstuur mail (%s)"
@@ -4724,13 +4489,13 @@ msgid "Send message"
 msgstr "Verstuur bericht"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
+#: model:ir.model.fields,field_description:mail.field_mail_channel__email_send
 msgid "Send messages by email"
 msgstr "Verzend berichten via e-mail"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_from
-#: model:ir.model.fields,help:mail.field_mail_template_email_from
+#: model:ir.model.fields,help:mail.field_email_template_preview__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 "
 "value will be the author's email alias if configured, or email address."
@@ -4741,14 +4506,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Sending Error"
 msgstr "Verzendingsfout"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:108
+#: code:addons/mail/static/src/xml/discuss.xml:108
 #, python-format
 msgid "Sends messages by email"
 msgstr "Verzend berichten via e-mail"
@@ -4760,25 +4525,30 @@ msgid "Sent"
 msgstr "Verzonden"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_email
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "Sent by"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_email
 msgid "Sent by Email"
 msgstr "Verzonden per e-mail"
 
 #. 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
+#: 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 "Reeks"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Settings"
 msgstr "Instellingen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__shortcode_type
 msgid "Shortcode Type"
 msgstr "Shortcode soort"
 
@@ -4789,7 +4559,7 @@ msgid "Shortcodes"
 msgstr "Shortcodes"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__source
 msgid "Shortcut"
 msgstr "Afkorting"
 
@@ -4800,20 +4570,20 @@ msgid "Show all records which has next action date is before today"
 msgstr "Toon alle records welke een actiedatum voor vandaag hebben"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:667
+#: code:addons/mail/models/mail_channel.py:673
 #, python-format
 msgid "Show an helper message"
 msgstr "Geen een help bericht weer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,field_description:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_mail_template__ref_ir_act_window
 msgid "Sidebar action"
 msgstr "Navigatiekolom actie"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,help:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_mail_template__ref_ir_act_window
 msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
@@ -4822,10 +4592,10 @@ msgstr ""
 "het gerelateerde document model"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_avatar
 msgid ""
 "Small-sized image of this contact. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4836,12 +4606,12 @@ msgstr ""
 "dit veld overal waar een kleine afbeelding vereist is."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_small
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_small
 msgid "Small-sized photo"
 msgstr "Kleine foto"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_small
+#: model:ir.model.fields,help:mail.field_mail_channel__image_small
 msgid ""
 "Small-sized photo of the group. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4857,7 +4627,7 @@ msgid "Smiley"
 msgstr "Smiley"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_res_model_id
+#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_id
 msgid ""
 "Specify a model if the activity should be specific to a model and not "
 "available when managing activities for other models."
@@ -4868,74 +4638,52 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:661
-#: code:addons/mail/static/src/xml/client_action.xml:28
-#: code:addons/mail/static/src/xml/client_action.xml:156
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred
+#: code:addons/mail/static/src/js/services/chat_manager.js:89
+#: code:addons/mail/static/src/xml/discuss.xml:28
+#: code:addons/mail/static/src/xml/discuss.xml:156
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred
 #, python-format
 msgid "Starred"
 msgstr "Met ster"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_state
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_state
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_mail_activity__state
 msgid "State"
 msgstr "Staat / Provincie"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_state
+#: 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
 msgid "Status"
 msgstr "Status"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,help:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,help:mail.field_event_track_activity_state
-#: model:ir.model.fields,help:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,help:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,help:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,help:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,help:mail.field_product_template_activity_state
-#: model:ir.model.fields,help:mail.field_project_task_activity_state
-#: model:ir.model.fields,help:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,help:mail.field_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
+#: model:ir.model.fields,help:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,help:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,help:mail.field_event_track__activity_state
+#: model:ir.model.fields,help:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,help:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,help:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,help:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,help:mail.field_note_note__activity_state
+#: model:ir.model.fields,help:mail.field_product_product__activity_state
+#: model:ir.model.fields,help:mail.field_product_template__activity_state
+#: model:ir.model.fields,help:mail.field_project_task__activity_state
+#: model:ir.model.fields,help:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,help:mail.field_repair_order__activity_state
+#: model:ir.model.fields,help:mail.field_res_partner__activity_state
+#: model:ir.model.fields,help:mail.field_res_users__activity_state
+#: model:ir.model.fields,help:mail.field_sale_order__activity_state
+#: model:ir.model.fields,help:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,help:mail.field_survey_survey__activity_state
 msgid ""
 "Status based on activities\n"
 "Overdue: Due date is already passed\n"
@@ -4948,33 +4696,33 @@ msgstr ""
 "Gepland: Toekomstige activiteiten."
 
 #. 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
+#: 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"
 msgstr "Sub-veld"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,field_description:mail.field_mail_template_sub_object
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,field_description:mail.field_mail_template__sub_object
 msgid "Sub-model"
 msgstr "Sub-model"
 
 #. module: mail
 #. 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_mail_compose_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_mail_subject
-#: model:ir.model.fields,field_description:mail.field_mail_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_template_subject
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subject
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__subject
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_mail__subject
+#: model:ir.model.fields,field_description:mail.field_mail_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_template__subject
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subject
 #, python-format
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_subject
-#: model:ir.model.fields,help:mail.field_mail_template_subject
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr "Onderwerp (tijdelijke aanduidingen kan hier worden gebruikt)"
@@ -4986,22 +4734,22 @@ msgstr "Onderwerp..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:216
+#: code:addons/mail/static/src/xml/thread.xml:221
 #, python-format
 msgid "Subject:"
 msgstr "Onderwerp:"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_substitution
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__substitution
 msgid "Substitution"
 msgstr "Vervanging"
 
 #. module: mail
-#: 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_1993
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subtype_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subtype_id
 #: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
 msgid "Subtype"
 msgstr "Subtype"
@@ -5013,8 +4761,8 @@ msgid "Subtypes"
 msgstr "Subtypes"
 
 #. 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
+#: 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 "Samenvatting"
 
@@ -5026,7 +4774,7 @@ msgid "System notification"
 msgstr "Systeem melding"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,help:mail.field_mail_activity__has_recommended_activities
 msgid "Technical field for UX purpose"
 msgstr "Technisch veld voor UI doeleinden"
 
@@ -5036,6 +4784,14 @@ msgid "Template Preview"
 msgstr "Sjabloon voorbeeld"
 
 #. module: mail
+#: code:addons/mail/models/mail_template.py:264
+#, python-format
+msgid ""
+"Template rendering failed, this could mean that your template contains "
+"python syntax errors"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_template_tree_all
 #: model:ir.ui.menu,name:mail.menu_email_templates
 #: model:ir.ui.view,arch_db:mail.email_template_form
@@ -5045,14 +4801,24 @@ msgid "Templates"
 msgstr "Sjablonen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The"
+msgstr "De"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The email sent to"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_shortcode__substitution
 msgid "The escaped html code replacing the shortcut"
 msgstr "De espaced html code ter vervanging van de snelkoppeling"
 
 #. module: mail
-#: 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_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
 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 "
@@ -5063,9 +4829,9 @@ msgstr ""
 "dit model (Bijv. een project taak)."
 
 #. module: mail
-#: 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_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
 msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
@@ -5074,9 +4840,9 @@ msgstr ""
 "van vacature@uwbedrijf.nl wilt afvangen."
 
 #. module: mail
-#: 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_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
 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 "
@@ -5090,9 +4856,9 @@ msgstr ""
 "gebruiker gebruikt."
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:165
-#: code:addons/mail/models/mail_message.py:579
-#: code:addons/mail/models/mail_message.py:674
+#: code:addons/mail/models/mail_activity.py:175
+#: code:addons/mail/models/mail_message.py:578
+#: code:addons/mail/models/mail_message.py:678
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -5104,18 +4870,18 @@ msgstr ""
 "(Document type: %s, Bewerking: %s)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__source
 msgid "The shortcut which must be replaced in the Chat Messages"
 msgstr "De snelkoppeling die moet vervangen worden in de chat berichten"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__unicode_source
 msgid "The source is replaced by this unicode character in the Chat Messages"
 msgstr "De bron is vervangen door dit unicode karakter in de chat berichten"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,help:mail.field_mail_template_model_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,help:mail.field_mail_template__model_id
 msgid "The type of document this template can be used with"
 msgstr "Het soort document waarvoor dit sjabloon kan worden gebruikt"
 
@@ -5125,7 +4891,7 @@ msgid "This"
 msgstr "Dit"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image
+#: model:ir.model.fields,help:mail.field_mail_channel__image
 msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
@@ -5134,7 +4900,7 @@ msgstr ""
 "beperkt tot 1024x1024px."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_public
+#: model:ir.model.fields,help:mail.field_mail_channel__public
 msgid ""
 "This group is visible by non members. Invisible groups can add members "
 "through the invite button."
@@ -5148,20 +4914,20 @@ msgid "Thread"
 msgstr "Conversatie"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_to
 msgid "To"
 msgstr "Aan"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_to
 msgid "To (Emails)"
 msgstr "Naar (E-mails)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_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
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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)"
 msgstr "Naar (Relaties)"
 
@@ -5176,8 +4942,8 @@ msgstr "Aan:"
 #. module: mail
 #. openerp-web
 #: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:25
-#: code:addons/mail/static/src/js/thread.js:242
+#: code:addons/mail/static/src/js/activity.js:82
+#: code:addons/mail/static/src/js/thread.js:328
 #: code:addons/mail/static/src/xml/systray.xml:75
 #: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
 #: selection:hr.applicant,activity_state:0
@@ -5187,12 +4953,12 @@ msgstr "Aan:"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -5214,7 +4980,7 @@ msgstr "Te doen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:35
+#: code:addons/mail/static/src/js/activity.js:92
 #, python-format
 msgid "Tomorrow"
 msgstr "Morgen"
@@ -5225,10 +4991,10 @@ msgid "Topics discussed in this group..."
 msgstr "Onderwerpen welke worden besproken in deze groep..."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid ""
 "Tracked values are stored in a separate model. This field allow to "
 "reconstruct the tracking and to generate statistics on the model."
@@ -5238,7 +5004,7 @@ msgstr ""
 "het model."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,field_description:mail.field_ir_model_fields__track_visibility
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Tracking"
 msgstr "Volgen"
@@ -5256,28 +5022,28 @@ msgid "Tracking Values"
 msgstr "Traceringswaardes"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid "Tracking values"
 msgstr "Traceringswaardes"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_type
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_type
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_type
 msgid "Type"
 msgstr "Soort"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_uuid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__uuid
 msgid "UUID"
 msgstr "UUID"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:235
+#: code:addons/mail/models/mail_mail.py:233
 #, python-format
 msgid "Unable to connect to SMTP Server"
 msgstr "Kon niet verbinden met SMTP server"
@@ -5292,7 +5058,6 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:700
 #: code:addons/mail/static/src/xml/followers.xml:22
 #, python-format
 msgid "Unfollow"
@@ -5305,143 +5070,145 @@ msgid ""
 msgstr "Helaas is deze e-mail alias al in gebruik. Kies een unieke alias."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__unicode_source
 msgid "Unicode Character"
 msgstr "Unicode karakter"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread
 msgid "Unread Messages"
 msgstr "Ongelezen berichten"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread_counter
 msgid "Unread Messages Counter"
 msgstr "Aantal ongelezen berichten"
 
@@ -5452,61 +5219,61 @@ msgstr "Ongelezen berichten"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all"
 msgstr "Alle sterren verwijderen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all messages"
 msgstr "Alle berichten met sterren verwijderen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe"
 msgstr "Uitschrijven"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe from channel"
 msgstr "Uitschrijven van kanaal"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:510
+#: code:addons/mail/models/mail_template.py:504
 #, python-format
 msgid "Unsupported report type %s found."
 msgstr "Niet ondersteunde rapport soort %s gevonden."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:322
+#: code:addons/mail/static/src/xml/thread.xml:327
 #, python-format
 msgid "Uploading"
 msgstr "Uploaden"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Uploading error"
 msgstr "Fout bij uploaden"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_use_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_use_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__use_active_domain
 msgid "Use active domain"
 msgstr "Gebruik actief domein"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_template_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_template_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__template_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__template_id
 msgid "Use template"
 msgstr "Gebruik sjabloon"
 
@@ -5516,7 +5283,7 @@ msgid "Use your own email servers"
 msgstr "Gebruik uw eigen e-mail servers"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_sequence
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__sequence
 msgid "Used to order subtypes."
 msgstr "Gebruikt om subtypes te sorteren"
 
@@ -5529,7 +5296,7 @@ msgstr "Gebruiker"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:51
+#: code:addons/mail/static/src/xml/discuss.xml:51
 #: code:addons/mail/static/src/xml/extended_chat_window.xml:8
 #, python-format
 msgid "User name"
@@ -5541,7 +5308,7 @@ msgid "Users"
 msgstr "Gebruikers"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:711
+#: code:addons/mail/models/mail_channel.py:717
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Gebruikers in dit kanaal: %s %s en u."
@@ -5558,14 +5325,14 @@ msgstr ""
 " profiteren van een kant-en-klare e-mailserver (@ mijnbedrijf.odoo.com)."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:670
+#: code:addons/mail/models/mail_thread.py:696
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 #, python-format
 msgid "View"
 msgstr "Weergave"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:668
+#: code:addons/mail/models/mail_thread.py:694
 #, python-format
 msgid "View %s"
 msgstr "Bekijk %s"
@@ -5584,8 +5351,8 @@ msgstr ""
 "Weet u zeker dat u de volger wilt verwijderen?"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_sub_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__sub_model_object_field
 msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
@@ -5594,8 +5361,8 @@ msgstr ""
 "doelveld selecteren binnen de bestemming document model (sub-model)."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,help:mail.field_mail_template_sub_object
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,help:mail.field_mail_template__sub_object
 msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
@@ -5604,7 +5371,7 @@ msgstr ""
 "het document-model van het relatieveld waar het heen gaat."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,help:mail.field_ir_model_fields__track_visibility
 msgid ""
 "When set, every modification to this field will be tracked in the chatter."
 msgstr ""
@@ -5612,13 +5379,13 @@ msgstr ""
 "chatter."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_is_log
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_is_log
+#: model:ir.model.fields,help:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__is_log
 msgid "Whether the message is an internal note (comment mode only)"
 msgstr "Of het bericht een interne notitie is (alleen commentaar modus)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,help:mail.field_ir_model__is_mail_thread
 msgid "Whether this model supports messages and notifications."
 msgstr "Of dit model berichten en notificaties ondersteund."
 
@@ -5636,47 +5403,47 @@ msgstr "Schrijf feedback"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:12
+#: code:addons/mail/static/src/xml/composer.xml:11
 #, python-format
-msgid "Write something..."
-msgstr "Schrijf iets..."
+msgid "Write Something..."
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:29
-#: code:addons/mail/static/src/js/thread.js:244
+#: code:addons/mail/static/src/js/activity.js:86
+#: code:addons/mail/static/src/js/thread.js:330
 #, python-format
 msgid "Yesterday"
 msgstr "Gisteren"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:96
+#: code:addons/mail/static/src/js/discuss.js:98
 #, python-format
 msgid "You added <b>%s</b> to the conversation."
 msgstr "U heeft <b>%s</b> toegevoegd aan de conversatie."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:708
+#: code:addons/mail/models/mail_channel.py:714
 #, python-format
 msgid "You are alone in this channel."
 msgstr "U bent alleen in dit kanaal."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:677
+#: code:addons/mail/models/mail_channel.py:683
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "U zit in een privé conversatie met <b>@%s</b>."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:672
+#: code:addons/mail/models/mail_channel.py:678
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "U bent in kanaal <b>#%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:114
+#: code:addons/mail/static/src/xml/thread.xml:119
 #, python-format
 msgid ""
 "You can mark any message as 'starred', and it shows up in this channel."
@@ -5685,7 +5452,7 @@ msgstr ""
 "kanaal."
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:54
+#: code:addons/mail/models/res_users.py:53
 #, python-format
 msgid ""
 "You cannot create a new user from here.\n"
@@ -5705,14 +5472,11 @@ msgstr ""
 "modules."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:349
+#: code:addons/mail/models/mail_thread.py:342
 #, python-format
 msgid ""
-"You could also add a new %(document)s by sending an email to: "
-"%(email_link)s."
+"You could also add a new %(document)s by sending an email to %(email_link)s"
 msgstr ""
-"U kan ook een nieuw document toevoegen %(document)s door een e-mail te "
-"verzenden naar: %(email_link)s."
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
@@ -5721,14 +5485,14 @@ msgstr "U bent toegewezen aan de"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "You have been invited to: "
 msgstr "U bent uitgenodigd om:"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,help:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_template__attachment_ids
 msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
@@ -5738,28 +5502,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:473
+#: code:addons/mail/static/src/js/services/chat_manager.js:1536
 #, python-format
 msgid "You unpinned your conversation with <b>%s</b>."
 msgstr "U heeft u conversatie ge-unpinned <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:471
+#: code:addons/mail/static/src/js/services/chat_manager.js:1534
 #, python-format
 msgid "You unsubscribed from <b>%s</b>."
 msgstr "U heeft zich uitgeschreven van <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:217
+#: code:addons/mail/static/src/xml/discuss.xml:217
 #, python-format
 msgid "You:"
 msgstr "U:"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Your message has not been sent."
 msgstr "Uw bericht is niet verzonden."
@@ -5771,23 +5535,35 @@ msgid "Your template should define email_from"
 msgstr "Uw sjabloon moet email_from definiëren"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "alias %s: %s"
 msgstr "alias %s: %s"
 
 #. module: mail
+#: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
+msgid "base.partner.merge.automatic.wizard"
+msgstr "base.partner.merge.automatic.wizard"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "by"
 msgstr "door"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid ""
+"cannot be processed. This address\n"
+"    is used to collect replies and should not be used to directly contact"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "aangemaakt"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:315
+#: code:addons/mail/models/mail_thread.py:309
 #, python-format
 msgid "document"
 msgstr "document"
@@ -5808,7 +5584,7 @@ msgstr "Bijv. Bespreken van de offerte"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "enable desktop notifications"
 msgstr "schakel desktop notificaties in"
@@ -5843,13 +5619,13 @@ msgid "has been"
 msgstr "is"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:282
+#: code:addons/mail/models/mail_alias.py:271
 #, python-format
 msgid "incorrectly configured alias"
 msgstr "Foutief geconfigureerde alias"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:278
+#: code:addons/mail/models/mail_alias.py:267
 #, python-format
 msgid "incorrectly configured alias (unknown reference record)"
 msgstr "foutief geconfigureerde alias (onbekend gelinkt record)"
@@ -5870,19 +5646,19 @@ msgid "mail.alias.mixin"
 msgstr "mail.alias.mixin"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:943
+#: code:addons/mail/models/mail_thread.py:925
 #, python-format
 msgid "model %s does not accept document creation"
 msgstr "model %s accepteert geen document aanmaak"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:938
+#: code:addons/mail/models/mail_thread.py:920
 #, python-format
 msgid "model %s does not accept document update"
 msgstr "model %s accepteert geen document updates"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:931
+#: code:addons/mail/models/mail_thread.py:913
 #, python-format
 msgid ""
 "model %s does not accept document update, fall back on document creation"
@@ -5908,14 +5684,14 @@ msgstr "nu"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:177
+#: code:addons/mail/static/src/xml/thread.xml:181
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "on"
 msgstr "op"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid ""
 "posting a message without model should be with a null res_id (private "
@@ -5925,7 +5701,7 @@ msgstr ""
 "bericht), ontvangen %s"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:917
+#: code:addons/mail/models/mail_thread.py:899
 #, python-format
 msgid ""
 "posting a message without model should be with a parent_id (private message)"
@@ -5958,13 +5734,13 @@ msgid "record:"
 msgstr "regel:"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:935
+#: code:addons/mail/models/mail_thread.py:917
 #, python-format
 msgid "reply to missing document (%s,%s)"
 msgstr "antwoord op ontbrekend document (%s,%s)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:928
+#: code:addons/mail/models/mail_thread.py:910
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
 msgstr ""
@@ -5977,40 +5753,45 @@ msgid "res.config.settings"
 msgstr "res.config.settings"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid "resetting thread_id"
 msgstr "resetting thread_id"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:254
+#: code:addons/mail/models/mail_channel.py:252
 #, python-format
 msgid "restricted to channel members"
 msgstr "beperkt tot kanaal leden"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:287
+#: code:addons/mail/models/mail_alias.py:276
 #, python-format
 msgid "restricted to followers"
 msgstr "beperkt tot volgers"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:291
+#: code:addons/mail/models/mail_alias.py:280
 #, python-format
 msgid "restricted to known authors"
 msgstr "Beperkt tot bekende auteurs"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:899
 #: code:addons/mail/models/mail_thread.py:917
-#: code:addons/mail/models/mail_thread.py:935
-#: code:addons/mail/models/mail_thread.py:938
-#: code:addons/mail/models/mail_thread.py:943
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:920
+#: code:addons/mail/models/mail_thread.py:925
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "skipping"
 msgstr "overslaan"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "team."
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:20
 #, python-format
@@ -6018,13 +5799,18 @@ msgid "this document"
 msgstr "dit document"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "unknown error"
 msgstr "onbekende fout"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:906
+#: code:addons/mail/models/mail_thread.py:888
 #, python-format
 msgid "unknown target model %s"
 msgstr "onbekend doel model %s"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "using"
+msgstr ""
diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po
index abd9e2478be..224f72dc31d 100644
--- a/addons/mail/i18n/pt_BR.po
+++ b/addons/mail/i18n/pt_BR.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Mateus Lopes <mateus1@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # grazziano <gra.negocia@gmail.com>, 2016
 # Clemilton Clementino <clemylton@hotmail.com>, 2016
 # falexandresilva <falexandresilva@gmail.com>, 2016
@@ -12,15 +12,15 @@
 # Adriel Kotviski <kotviski@gmail.com>, 2016
 # Luiz Carlos de Lima <luiz.carlos@akretion.com.br>, 2016
 # Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2016
-# SILMAR PINHEIRO VIANA <pinheirosilmar@gmail.com>, 2017
-# Danilo Rodrigues <danilo.i997@hotmail.com>, 2017
+# Silmar <pinheirosilmar@gmail.com>, 2017
+# Danilo Rodrigues, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.1\n"
+"Project-Id-Version: Odoo Server saas~11.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-13 14:36+0000\n"
-"PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Danilo Rodrigues <danilo.i997@hotmail.com>, 2017\n"
+"POT-Creation-Date: 2018-03-22 14:10+0000\n"
+"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"Last-Translator: Danilo Rodrigues, 2017\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,168 +29,59 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_data_notification_email_default
-msgid ""
-"\n"
-"% set company = ctx.get('company', user.company_id)\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"
-"        <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-"        <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
-"    </div>\n"
-"</div>\n"
-"% endif\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('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('has_button_follow'):\n"
-"        % if ctx.get('has_button_access'):\n"
-"           |\n"
-"        % endif\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=\"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=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
-"        % endfor\n"
-"        % endif\n"
-"    </td>\n"
-"    <td valign=\"center\" align=\"right\">\n"
-"        <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\">\n"
-"    </td>\n"
-"</tr>\n"
-"<tr>\n"
-"    <td colspan=\"2\" style=\"text-align:center;\">\n"
-"        <hr width=\"100%\"\n"
-"            style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
-"        % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
-"        <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n"
-"            <strong>Internal communication</strong>: Replying will post an internal note. Followers won't receive any email notification.\n"
-"        </p>\n"
-"        % endif\n"
-"    </td>\n"
-"</tr>\n"
-"</tbody></table>\n"
-"</div>\n"
-"% endif\n"
-"<div>\n"
-"    ${object.body | safe}\n"
-"</div>\n"
-"% if ctx.get('tracking'):\n"
-"    <ul>\n"
-"    % for tracking in ctx['tracking']\n"
-"        <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
-"    % endfor\n"
-"    </ul>\n"
-"% endif\n"
-"\n"
-"% if ctx.get('signature'):\n"
-"    ${ctx['signature'] | safe}\n"
-"% endif\n"
-"<br/>\n"
-"<p style=\"color: #555555;\">\n"
-"    Sent by\n"
-"    % if ctx.get('website_url'):\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 target=\"_blank\" 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:674
+#: code:addons/mail/models/mail_channel.py:680
 #, 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) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-msgstr ""
-"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:63
+#: code:addons/mail/static/src/js/services/chat_manager.js:1634
 #, python-format
 msgid "%d Messages"
 msgstr "%d Mensagens"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:31
+#: code:addons/mail/static/src/js/activity.js:88
 #, python-format
 msgid "%d days overdue"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:248
+#: code:addons/mail/models/mail_template.py:279
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:236
+#: code:addons/mail/models/mail_thread.py:234
 #, python-format
 msgid "%s created"
 msgstr "%s criado"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:81
+#: code:addons/mail/models/res_users.py:80
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s conectou-se à rede de %s."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:211
 #, python-format
 msgid "&nbsp;("
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:179
+#: code:addons/mail/static/src/xml/thread.xml:184
 #, python-format
 msgid "(from"
 msgstr "(de"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,help:mail.field_mail_shortcode__shortcode_type
 msgid ""
 "* Smiley are only used for HTML code to display an image * Text (default "
 "value) is used to substitute text with another text"
@@ -205,7 +96,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:331
+#: code:addons/mail/static/src/xml/thread.xml:336
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr "-------- Mostrar mensagens antigas --------"
@@ -232,7 +123,7 @@ msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:684
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -243,7 +134,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:584
+#: code:addons/mail/models/mail_channel.py:507
+#, python-format
+msgid ""
+"<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
+"href=\"#\" class=\"o_channel_redirect\" data-oe-"
+"id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:590
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -253,8 +153,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:508
-#: code:addons/mail/models/mail_channel.py:561
+#: code:addons/mail/models/mail_channel.py:514
+#: code:addons/mail/models/mail_channel.py:567
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -370,6 +270,11 @@ msgstr ""
 "<span class=\"o_stat_text\">Ação de Contexto</span>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+msgid "<span class=\"oe_inline\">days</span>"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>\n"
@@ -386,6 +291,13 @@ msgid "<strong> Feedback</strong>"
 msgstr ""
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid ""
+"<strong>Internal communication</strong>: Replying will post an internal "
+"note. Followers won't receive any email notification."
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>Only records checked in list view will be used.</strong><br/>\n"
@@ -398,9 +310,9 @@ msgid "<strong>Recommended Activities</strong>"
 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_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
 msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
@@ -423,115 +335,118 @@ msgid "Access Groups"
 msgstr "Grupos de Acesso"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction
 msgid "Action Needed"
 msgstr "Ação Necessária"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__default
 msgid "Activated by default when subscribing."
 msgstr "Ativado por padrão na inscrição"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__active
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_search
 msgid "Active"
 msgstr "Ativo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__active_domain
 msgid "Active domain"
 msgstr "Domínio Ativo"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/systray.xml:87
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_ids
-#: model:ir.model.fields,field_description:mail.field_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.model.fields,field_description:mail.field_account_invoice__activity_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_ids
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
 #: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 #: model:mail.message.subtype,name:mail.mt_activities
@@ -543,7 +458,7 @@ msgstr "Atividades"
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:60
 #: model:ir.model,name:mail.model_mail_activity
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_type_id
+#: 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
@@ -557,6 +472,32 @@ msgid "Activity Mixin"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_state
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_state
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_state
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. 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"
@@ -578,7 +519,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:87
+#: code:addons/mail/static/src/xml/discuss.xml:87
 #, python-format
 msgid "Add"
 msgstr "Adicionar"
@@ -586,7 +527,7 @@ msgstr "Adicionar"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:64
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_channel_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__channel_ids
 #, python-format
 msgid "Add Channels"
 msgstr "Adicionar Canais"
@@ -594,7 +535,7 @@ msgstr "Adicionar Canais"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:61
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_partner_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
 msgid "Add Followers"
@@ -607,22 +548,28 @@ msgid "Add Followers can only be done on a mail thread model"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,field_description:mail.field_mail_template_user_signature
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,field_description:mail.field_mail_template__user_signature
 msgid "Add Signature"
 msgstr "Adicionar Assinatura"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:41
-#: code:addons/mail/static/src/xml/client_action.xml:186
+#: code:addons/mail/static/src/xml/discuss.xml:41
+#: code:addons/mail/static/src/xml/discuss.xml:186
 #, python-format
 msgid "Add a channel"
 msgstr "Adicionar um canal"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:335
+#, python-format
+msgid "Add a new %(document)s or send an email to %(email_link)s"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:60
+#: code:addons/mail/static/src/xml/discuss.xml:60
 #, python-format
 msgid "Add a private channel"
 msgstr ""
@@ -639,7 +586,7 @@ msgid "Add contacts to notify..."
 msgstr "Adicionar contatos para notificação..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
 msgid "Additional Contacts"
 msgstr "Contato adicional"
 
@@ -654,45 +601,45 @@ msgid "Advanced Settings"
 msgstr "Configurações Avançadas"
 
 #. 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_res_users_alias_id
+#: 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_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
 msgid "Alias"
 msgstr "Apelido"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_contact
+#: 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
+#: model:ir.model.fields,field_description:mail.field_res_users__alias_contact
 msgid "Alias Contact Security"
 msgstr "Apelido do Contato de Segurança"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__alias_domain
 msgid "Alias Domain"
 msgstr "Apelido do Domínio"
 
 #. module: mail
-#: 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_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
 msgid "Alias Name"
 msgstr "Nome do Apelido"
 
 #. module: mail
-#: 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_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
 msgid "Alias domain"
 msgstr "Apelido do domínio"
 
 #. module: mail
-#: 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_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
 msgid "Aliased Model"
 msgstr "Modelo Apelidado"
 
@@ -717,16 +664,16 @@ msgstr "Sempre"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:198
+#: code:addons/mail/static/src/js/services/chat_manager.js:1328
 #, python-format
 msgid "Anonymous"
 msgstr "Anônimo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__no_auto_thread
 msgid ""
 "Answers do not go in the original document discussion thread. This has an "
 "impact on the generated message-id."
@@ -735,8 +682,8 @@ msgstr ""
 "impacto sobre o gerado mensagem-id."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_id
 msgid "Applies to"
 msgstr "Aplica-se a"
 
@@ -748,9 +695,14 @@ msgid "Apply"
 msgstr "Aplicar"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+msgid "Archived"
+msgstr "Arquivado"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:45
-#: model:ir.model.fields,field_description:mail.field_mail_activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
 #, python-format
 msgid "Assigned to"
 msgstr "Atribuído a"
@@ -761,19 +713,19 @@ msgid "Attach a file"
 msgstr "Anexar um arquivo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_template__attachment_ids
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Attachments"
 msgstr "Anexos"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_message_attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_message__attachment_ids
 msgid ""
 "Attachments are linked to a document through model / res_id and to the "
 "message through this field."
@@ -792,10 +744,10 @@ msgid "Authenticated Partners"
 msgstr "Parceiros autenticados"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_id
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Author"
 msgstr "Autor"
@@ -806,10 +758,10 @@ msgid "Author Signature (mass mail only)"
 msgstr "Assinatura do Autor (e-mails em massa apenas)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,help:mail.field_mail_mail_author_id
-#: model:ir.model.fields,help:mail.field_mail_message_author_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,help:mail.field_mail_mail__author_id
+#: model:ir.model.fields,help:mail.field_mail_message__author_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_id
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that"
 " did not match any partner."
@@ -818,27 +770,27 @@ msgstr ""
 "endereço de e-mail que não corresponde a nenhum parceiro."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_avatar
 msgid "Author's avatar"
 msgstr "Avatar do autor"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_public_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_public_id
 msgid "Authorized Group"
 msgstr "Grupo Autorizado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_template__auto_delete
 msgid "Auto Delete"
 msgstr "Excluir Automaticamente"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_ids
 msgid "Auto Subscription"
 msgstr "Auto Inscrição"
 
@@ -860,16 +812,16 @@ msgid "Be careful with channels following internal notifications"
 msgstr "Tenha cuidado com as seguintes notificações internas de canais"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
-#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
 msgid "Body"
 msgstr "Conteúdo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,field_description:mail.field_res_users_message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_users__message_bounce
 msgid "Bounce"
 msgstr "Rejeitado"
 
@@ -915,32 +867,32 @@ msgid "Canned Response / Shortcode"
 msgstr "Respostas Conservadas / Código Curto"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_cc
+#: model:ir.model.fields,help:mail.field_mail_mail__email_cc
 msgid "Carbon copy message recipients"
 msgstr "Copiar destinatários"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,help:mail.field_mail_template_email_cc
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,help:mail.field_mail_template__email_cc
 msgid "Carbon copy recipients (placeholders may be used here)"
 msgstr "Cópia oculta para destinatários (placeholders podem ser usados aqui)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,help:mail.field_mail_activity_type_category
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,help:mail.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__category
 msgid "Category"
 msgstr "Categoria"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_cc
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_cc
 msgid "Cc"
 msgstr "Cc"
 
@@ -950,40 +902,40 @@ msgid "Change"
 msgstr "Alterar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field
 msgid "Changed Field"
 msgstr "Campo Alterado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
 #: selection:mail.channel,channel_type:0
 msgid "Channel"
 msgstr "Canal"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids
+#: 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_type
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_type
 msgid "Channel Type"
 msgstr "Tipo de Canal"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:36
-#: code:addons/mail/static/src/xml/client_action.xml:172
+#: code:addons/mail/static/src/xml/discuss.xml:36
+#: code:addons/mail/static/src/xml/discuss.xml:172
 #: code:addons/mail/static/src/xml/systray.xml:19
 #: code:addons/mail/static/src/xml/systray.xml:36
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__channel_ids
 #: model:ir.ui.menu,name:mail.mail_channel_menu_settings
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
 #, python-format
@@ -998,7 +950,7 @@ msgstr "Canais/Parceiro"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:168
+#: code:addons/mail/static/src/xml/discuss.xml:168
 #: code:addons/mail/static/src/xml/systray.xml:18
 #: code:addons/mail/static/src/xml/systray.xml:32
 #: model:ir.actions.client,name:mail.mail_channel_action_client_chat
@@ -1017,10 +969,10 @@ msgid "Chat Shortcode"
 msgstr "Código Curto de Chat"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__child_ids
 msgid "Child Messages"
 msgstr "Mensagens Relacionadas"
 
@@ -1030,25 +982,6 @@ msgid "Choose an example"
 msgstr "Escolha um exemplo"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:342
-#, python-format
-msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
-msgstr ""
-"Clique aqui para adicionar novo %(document)s ou envie um e-mail para: "
-"%(email_link)s"
-
-#. module: mail
-#: code:addons/mail/models/mail_thread.py:358
-#, python-format
-msgid "Click here to add new %s"
-msgstr "Clique aqui para adicionar novo %s"
-
-#. module: mail
-#: model:ir.actions.act_window,help:mail.mail_shortcode_action
-msgid "Click to define a new chat shortcode."
-msgstr "Clique para definir um novo código abreviado de chat."
-
-#. module: mail
 #: selection:mail.channel.partner,fold_state:0
 msgid "Closed"
 msgstr "Fechado"
@@ -1064,8 +997,8 @@ msgid "Comma-separated ids of recipient partners"
 msgstr "Ids dos parceiros destinatários separados por vírgulas"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_partner_to
-#: model:ir.model.fields,help:mail.field_mail_template_partner_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr ""
@@ -1077,8 +1010,8 @@ msgid "Comma-separated recipient addresses"
 msgstr "Endereços dos destinatários separados por virtulas"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,help:mail.field_mail_template_email_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,help:mail.field_mail_template__email_to
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr ""
 "Endereços de e-mail separados por virgulas (placeholders podem ser usados "
@@ -1099,8 +1032,8 @@ msgid "Compose Email"
 msgstr "Escrever E-mail"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_composition_mode
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__composition_mode
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__composition_mode
 msgid "Composition mode"
 msgstr "Modo de composição"
 
@@ -1111,14 +1044,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:109
+#: code:addons/mail/static/src/xml/thread.xml:114
 #, python-format
 msgid "Congratulations, your inbox is empty"
 msgstr "Parabéns, sua caixa de entrada está vazia"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:647
+#: code:addons/mail/static/src/js/discuss.js:662
 #, python-format
 msgid "Congratulations, your inbox is empty!"
 msgstr ""
@@ -1135,20 +1068,20 @@ msgid "Content"
 msgstr "Conteúdo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_body
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body
-#: model:ir.model.fields,field_description:mail.field_mail_message_body
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_body
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__body
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body
+#: model:ir.model.fields,field_description:mail.field_mail_message__body
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__body
 msgid "Contents"
 msgstr "Conteúdo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_fold_state
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__fold_state
 msgid "Conversation Fold State"
 msgstr "Estado de Conversação"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_minimized
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_minimized
 msgid "Conversation is minimized"
 msgstr ""
 
@@ -1160,64 +1093,70 @@ msgid "Conversations"
 msgstr "Conversações"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,help:mail.field_res_users_message_bounce
+#: model:ir.model.fields,help:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,help:mail.field_res_users__message_bounce
 msgid "Counter of the number of bounced emails for this contact"
 msgstr "Contador do número de emails devolvidos para este contato"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:307
+#: code:addons/mail/static/src/js/discuss.js:318
 #, python-format
 msgid "Create %s"
 msgstr "Criar %s"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__create_date
 msgid "Create Date"
 msgstr "Data de Criação"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:350
+#, python-format
+msgid "Create a new %(document)s"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Created By"
 msgstr "Criado 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_uid
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:41
-#: 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
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_date
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_date
 #, python-format
 msgid "Created on"
 msgstr "Criado em"
@@ -1228,90 +1167,22 @@ msgid "Creation Month"
 msgstr "Mês de Criação"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,help:mail.field_mail_mail_starred
-#: model:ir.model.fields,help:mail.field_mail_message_starred
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_starred
+#: model:ir.model.fields,help:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,help:mail.field_mail_mail__starred
+#: model:ir.model.fields,help:mail.field_mail_message__starred
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__starred
 msgid "Current user has a starred notification linked to this message"
 msgstr "Usuário atual marcou uma notificação vinculada a esta mensagem"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_date
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__date
+#: model:ir.model.fields,field_description:mail.field_mail_message__date
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__date
 msgid "Date"
 msgstr "Data"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,help:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,help:mail.field_event_event_message_last_post
-#: model:ir.model.fields,help:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,help:mail.field_event_track_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_track_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
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,help:mail.field_note_note_message_last_post
-#: model:ir.model.fields,help:mail.field_product_product_message_last_post
-#: model:ir.model.fields,help:mail.field_product_template_message_last_post
-#: model:ir.model.fields,help:mail.field_project_project_message_last_post
-#: model:ir.model.fields,help:mail.field_project_task_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,help:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,help:mail.field_res_users_message_last_post
-#: model:ir.model.fields,help:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,help:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr "Data da ultima mensagem para o registro."
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Deadline"
 msgstr "Prazo Final"
@@ -1322,32 +1193,32 @@ msgid "Dear"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__default
 msgid "Default"
 msgstr "Padrão"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,field_description:mail.field_mail_template_null_value
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,field_description:mail.field_mail_template__null_value
 msgid "Default Value"
 msgstr "Valor Padrão"
 
 #. module: mail
-#: 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_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
 msgid "Default Values"
 msgstr "Valores Padrão"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__use_default_to
 msgid "Default recipients"
 msgstr "Destinatários padrão"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,help:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,help:mail.field_mail_template__use_default_to
 msgid ""
 "Default recipients of the record:\n"
 "- partner (using id on a partner or the partner_id field) OR\n"
@@ -1358,26 +1229,31 @@ msgstr ""
 "- e-mail (usando o email_from ou campo de e-mail)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.actions.act_window,help:mail.mail_shortcode_action
+msgid "Define a new chat shortcode"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete_message
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete_message
 msgid "Delete Message Copy"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete sent emails (mass mailing only)"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:320
+#: code:addons/mail/static/src/xml/thread.xml:325
 #, python-format
 msgid "Delete this attachment"
 msgstr "Excluir este anexo"
@@ -1388,15 +1264,15 @@ msgid "Delivery Failed"
 msgstr "Falha no Envio"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_description
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_description
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_description
+#: model:ir.model.fields,field_description:mail.field_mail_channel__description
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__description
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__description
 #: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
 msgid "Description"
 msgstr "Descrição"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_description
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__description
 msgid ""
 "Description that will be added in the message posted for this subtype. If "
 "void, the name will be added instead."
@@ -1406,7 +1282,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:46
+#: code:addons/mail/static/src/xml/discuss.xml:46
 #, python-format
 msgid "Direct Messages"
 msgstr "Mensagens Diretas"
@@ -1437,26 +1313,26 @@ msgid "Discussions"
 msgstr "Discussões"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_display_name
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__display_name
+#: 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_subtype__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_notification__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_thread__display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__display_name
 msgid "Display Name"
 msgstr "Nome para Exibição"
 
@@ -1470,13 +1346,13 @@ msgstr ""
 "composição com este modelo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_res_name
+#: 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
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete_message
 msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
@@ -1488,7 +1364,12 @@ msgid "Document Followers"
 msgstr "Seguidores do Documento"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_name
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_model_id
+msgid "Document Model"
+msgstr "Modelo de Documento"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_name
 msgid "Document Name"
 msgstr ""
 
@@ -1509,28 +1390,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:296
+#: code:addons/mail/static/src/xml/thread.xml:301
 #, python-format
 msgid "Download this PDF"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:272
-#: code:addons/mail/static/src/xml/thread.xml:285
-#: code:addons/mail/static/src/xml/thread.xml:308
+#: code:addons/mail/static/src/xml/thread.xml:277
+#: code:addons/mail/static/src/xml/thread.xml:290
+#: code:addons/mail/static/src/xml/thread.xml:313
 #, python-format
 msgid "Download this attachment"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity__date_deadline
 msgid "Due Date"
 msgstr "Data de Vencimento"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:37
+#: code:addons/mail/static/src/js/activity.js:94
 #, python-format
 msgid "Due in %d days"
 msgstr ""
@@ -1562,7 +1443,7 @@ msgid "Edit subscription"
 msgstr "Editar inscrição"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_email
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_email
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 #: model:mail.activity.type,name:mail.mail_activity_data_email
 #: selection:mail.compose.message,message_type:0
@@ -1597,12 +1478,12 @@ msgid "Email Search"
 msgstr "Pesquisar E-mail"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_email_status
+#: model:ir.model.fields,field_description:mail.field_mail_notification__email_status
 msgid "Email Status"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__template_id
 msgid "Email Template"
 msgstr "Modelo de E-mail"
 
@@ -1622,7 +1503,7 @@ msgid "Email Thread"
 msgstr "Tópico do E-mail"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_alias_id
+#: model:ir.model.fields,help:mail.field_res_users__alias_id
 msgid ""
 "Email address internally associated with this user. Incoming emails will "
 "appear in the user's notifications."
@@ -1631,10 +1512,10 @@ msgstr ""
 "recebidas aparecerão nas notificações do usuário."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_email_from
-#: model:ir.model.fields,help:mail.field_mail_mail_email_from
-#: model:ir.model.fields,help:mail.field_mail_message_email_from
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,help:mail.field_mail_compose_message__email_from
+#: model:ir.model.fields,help:mail.field_mail_mail__email_from
+#: model:ir.model.fields,help:mail.field_mail_message__email_from
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__email_from
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found and replaces the author_id field in the chatter."
@@ -1672,7 +1553,7 @@ msgid "Error during communication with the publisher warranty server."
 msgstr "Erro durante a comunicação com o servidor de garantia."
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:302
+#: code:addons/mail/models/mail_mail.py:300
 #, python-format
 msgid ""
 "Error without exception. Probably due do sending an email without computed "
@@ -1714,7 +1595,7 @@ msgid "Extended Filters..."
 msgstr "Filtros Extendidos..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_fail_counter
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__fail_counter
 msgid "Fail Mail"
 msgstr "Falha de Email"
 
@@ -1724,19 +1605,19 @@ msgid "Failed"
 msgstr "Falhou"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:374
+#: code:addons/mail/models/mail_template.py:368
 #, python-format
 msgid "Failed to render template %r using values %r"
 msgstr "Falha ao renderizar modelo %r usando valores %r"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,field_description:mail.field_mail_mail__failure_reason
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Failure Reason"
 msgstr "Motivo da Falha"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
 msgid ""
 "Failure reason. This is usually the exception thrown by the email server, "
 "stored to ease the debugging of mailing issues."
@@ -1745,45 +1626,45 @@ msgstr ""
 "armazenada para facilitar a depuração de problemas."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred_partner_ids
 msgid "Favorited By"
 msgstr "Adotado como favorito por"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:215
-#: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
+#: code:addons/mail/static/src/js/activity.js:245
+#: model:ir.model.fields,field_description:mail.field_mail_activity__feedback
 #, python-format
 msgid "Feedback"
 msgstr "Feedback"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_object_field
 msgid "Field"
 msgstr "Campo"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:24
+#: code:addons/mail/models/ir_model.py:30
 #, python-format
 msgid "Field \"Mail Thread\" cannot be changed to \"False\"."
 msgstr "Campo \"Conversa do Email\" não pode ser mudado para \"Falso\"."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_desc
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_desc
 msgid "Field Description"
 msgstr "Descrição do Campo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_type
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_type
 msgid "Field Type"
 msgstr "Tipo do Campo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__relation_field
 msgid ""
 "Field used to link the related model to the subtype model when using "
 "automatic subscription on a related document. The field is used to compute "
@@ -1799,8 +1680,8 @@ msgid "Fields"
 msgstr "Campos"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,help:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,help:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,help:mail.field_mail_template__copyvalue
 msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
@@ -1815,7 +1696,6 @@ msgstr "Dobrado"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:696
 #: code:addons/mail/static/src/xml/followers.xml:20
 #, python-format
 msgid "Follow"
@@ -1823,208 +1703,211 @@ msgstr "Seguir"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_followers
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_follower_ids
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: model:ir.ui.view,arch_db:mail.view_followers_tree
 msgid "Followers"
 msgstr "Seguidores"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_channel_ids
 msgid "Followers (Channels)"
 msgstr "Seguidores (Canais)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_partner_ids
 msgid "Followers (Partners)"
 msgstr "Seguidores (Parceiros)"
 
@@ -2053,18 +1936,18 @@ msgid "Following"
 msgstr "Seguindo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_icon
-#: model:ir.model.fields,help:mail.field_mail_activity_type_icon
+#: 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_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
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_from
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_from
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__email_from
 msgid "From"
 msgstr "De"
 
@@ -2087,7 +1970,7 @@ msgid "Gateway"
 msgstr "Gateway"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:55
+#: code:addons/mail/models/res_users.py:54
 #, python-format
 msgid "Go to the configuration panel"
 msgstr "Vá para o painel de configuração"
@@ -2130,49 +2013,54 @@ msgid "Has attachments"
 msgstr "Possui anexos"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_headers
+#: model:ir.model.fields,field_description:mail.field_mail_mail__headers
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Headers"
 msgstr "Cabeçalhos"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_hidden
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Hello"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
 msgid "Hidden"
 msgstr "Oculto"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_hidden
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__hidden
 msgid "Hide the subtype in the follower options"
 msgstr "Esconder o subtipo nas opções dos seguidores"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_id
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__id
+#: 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_subtype__id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__id
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__id
+#: model:ir.model.fields,field_description:mail.field_mail_template__id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__id
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mail
-#: 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_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
 msgid ""
 "ID of the parent record holding the alias (example: project holding the task"
 " creation alias)"
@@ -2181,163 +2069,165 @@ msgstr ""
 " de criação de tarefa)"
 
 #. 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
+#: 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 "Ícone"
 
 #. 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
+#: 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"
 msgstr "Id do recurso seguido"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:119
-#: code:addons/mail/static/src/xml/client_action.xml:203
+#: code:addons/mail/static/src/xml/discuss.xml:119
+#: code:addons/mail/static/src/xml/discuss.xml:203
 #, python-format
 msgid "Idle"
 msgstr "Inativo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,help:mail.field_event_event_message_unread
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread
-#: model:ir.model.fields,help:mail.field_event_track_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,help:mail.field_note_note_message_unread
-#: model:ir.model.fields,help:mail.field_product_product_message_unread
-#: model:ir.model.fields,help:mail.field_product_template_message_unread
-#: model:ir.model.fields,help:mail.field_project_project_message_unread
-#: model:ir.model.fields,help:mail.field_project_task_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread
-#: model:ir.model.fields,help:mail.field_res_users_message_unread
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,help:mail.field_event_event__message_unread
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread
+#: model:ir.model.fields,help:mail.field_event_track__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,help:mail.field_note_note__message_unread
+#: model:ir.model.fields,help:mail.field_product_product__message_unread
+#: model:ir.model.fields,help:mail.field_product_template__message_unread
+#: model:ir.model.fields,help:mail.field_project_project__message_unread
+#: model:ir.model.fields,help:mail.field_project_task__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread
+#: model:ir.model.fields,help:mail.field_res_users__message_unread
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread
 msgid "If checked new messages require your attention."
 msgstr "Se marcado, novas mensagens solicitarão sua atenção."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,help:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction
 msgid "If checked, new messages require your attention."
 msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
 msgid ""
 "If checked, the partners will receive an email warning they have been added "
 "in the document's followers."
@@ -2346,8 +2236,8 @@ msgstr ""
 "seguidores do documento."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,help:mail.field_mail_template_user_signature
+#: model:ir.model.fields,help:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,help:mail.field_mail_template__user_signature
 msgid ""
 "If checked, the user's signature will be appended to the text version of the"
 " message"
@@ -2356,8 +2246,8 @@ msgstr ""
 "mensagem"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_opt_out
-#: model:ir.model.fields,help:mail.field_res_users_opt_out
+#: model:ir.model.fields,help:mail.field_res_partner__opt_out
+#: model:ir.model.fields,help:mail.field_res_users__opt_out
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails for mass "
 "mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
@@ -2369,22 +2259,22 @@ msgstr ""
 " correio em massa."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_mail__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_scheduled_date
-#: model:ir.model.fields,help:mail.field_mail_template_scheduled_date
+#: model:ir.model.fields,help:mail.field_email_template_preview__scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_template__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible. Jinja2 placeholders may be used."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
 msgid ""
 "If you have setup a catch-all email domain redirected to the Odoo server, "
 "enter the domain name here."
@@ -2393,26 +2283,26 @@ msgstr ""
 "servidor Odoo, digite o nome do domínio aqui."
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:141
+#: code:addons/mail/models/mail_alias.py:130
 #, python-format
 msgid "Inactive Alias"
 msgstr "Apelido Inativo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:655
-#: code:addons/mail/static/src/xml/client_action.xml:22
-#: code:addons/mail/static/src/xml/client_action.xml:154
-#: code:addons/mail/static/src/xml/client_action.xml:164
+#: code:addons/mail/static/src/js/services/chat_manager.js:84
+#: code:addons/mail/static/src/xml/discuss.xml:22
+#: code:addons/mail/static/src/xml/discuss.xml:154
+#: code:addons/mail/static/src/xml/discuss.xml:164
 #, python-format
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,help:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,help:mail.field_mail_message_parent_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,help:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,help:mail.field_mail_message__parent_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__parent_id
 msgid "Initial thread message."
 msgstr "Mensagem inicial do tópico."
 
@@ -2423,12 +2313,12 @@ msgid "Integrations"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__internal
 msgid "Internal Only"
 msgstr "Apenas Interno"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:99
+#: code:addons/mail/models/mail_alias.py:88
 #, python-format
 msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
@@ -2438,7 +2328,8 @@ msgstr ""
 "python como \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1794
+#: code:addons/mail/models/mail_thread.py:1811
+#: code:addons/mail/models/mail_thread.py:1996
 #, python-format
 msgid ""
 "Invalid record set: should be called as model (without records) or on "
@@ -2448,14 +2339,14 @@ msgstr ""
 "ou no conjunto de registros de um único registro"
 
 #. module: mail
-#: code:addons/mail/controllers/main.py:41
+#: code:addons/mail/controllers/main.py:40
 #, python-format
 msgid "Invalid token in route %s"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "Invitation"
 msgstr "Convite"
@@ -2468,8 +2359,8 @@ msgstr "Convite para seguir %s: %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:44
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:44
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite"
 msgstr "Convidar"
@@ -2483,15 +2374,15 @@ msgstr "Convidar Seguidor"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:31
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:29
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite people"
 msgstr "Seguir pessoa"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:867
+#: code:addons/mail/static/src/js/discuss.js:882
 #, python-format
 msgid "Invite people to #%s"
 msgstr ""
@@ -2507,95 +2398,96 @@ msgid "Invited people only"
 msgstr "Somente pessoas convidadas"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_note_note_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_product_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_template_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_project_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_task_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_users_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_note_note__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_product__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_template__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_project__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_task__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_users__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_is_follower
 msgid "Is Follower"
 msgstr "É um seguidor"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification
+#: model:ir.model.fields,field_description:mail.field_mail_mail__notification
 msgid "Is Notification"
 msgstr "É Notificação"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_read
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_read
 msgid "Is Read"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_subscribed
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_subscribed
 msgid "Is Subscribed"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_member
 msgid "Is a member"
 msgstr "É um membro"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
 msgid "Is pinned on the interface"
 msgstr "É fixado na interface"
 
@@ -2610,144 +2502,76 @@ msgid "Join a group"
 msgstr "Participar de um grupo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_lang
-#: model:ir.model.fields,field_description:mail.field_mail_template_lang
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__lang
+#: model:ir.model.fields,field_description:mail.field_mail_template__lang
 msgid "Language"
 msgstr "Idioma"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_track_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_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_test_simple_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_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
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,field_description:mail.field_note_note_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_product_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_template_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_project_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_task_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_users_message_last_post
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_last_post
-msgid "Last Message Date"
-msgstr "Data da última mensagem"
-
-#. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner___last_update
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message___last_update
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract___last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message____last_update
+#: 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_subtype____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_notification____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_template____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_thread____last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract____last_update
 msgid "Last Modified on"
 msgstr "Última Modificação em"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_last_seen_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_seen_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_last_seen_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__seen_message_id
 msgid "Last Seen"
 msgstr "Visto pela ultima vez"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_uid
-#: 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_tracking_value_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_uid
 msgid "Last Updated by"
 msgstr "Última atualização 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_date
-#: 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_tracking_value_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_date
 msgid "Last Updated on"
 msgstr "Última atualização em"
 
@@ -2771,38 +2595,38 @@ msgstr "Folga"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:687
-#: code:addons/mail/static/src/xml/client_action.xml:112
+#: code:addons/mail/models/mail_channel.py:693
+#: code:addons/mail/static/src/xml/discuss.xml:112
 #, python-format
 msgid "Leave this channel"
 msgstr "Deixar o canal"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_channel_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__channel_ids
 msgid ""
 "List of channels that will be added as listeners of the current document."
 msgstr ""
 "Lista de canais que serão adicionados como ouvintes do documento atual.q"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__partner_ids
 msgid ""
 "List of partners that will be added as follower of the current document."
 msgstr "Lista de pessoas que foram incluídas como seguidores deste documento"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:698
+#: code:addons/mail/models/mail_channel.py:704
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__channel_id
 msgid "Listener"
 msgstr "Ouvinte"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_partner_ids
 msgid "Listeners"
 msgstr "Ouvintes"
 
@@ -2818,7 +2642,7 @@ msgstr "Conversa Ao Vivo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:31
+#: code:addons/mail/static/src/js/chatter_composer.js:30
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Log"
@@ -2842,8 +2666,8 @@ 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__is_log
 msgid "Log an Internal Note"
 msgstr "Registra uma nota interna"
 
@@ -2862,10 +2686,10 @@ msgid "Log or schedule an activity"
 msgstr ""
 
 #. 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
+#: 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 ""
 
@@ -2875,13 +2699,13 @@ msgid "Mail Channel Form"
 msgstr "Formulário de Canal de E-mail"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:369
+#: code:addons/mail/models/mail_mail.py:367
 #, python-format
 msgid "Mail Delivery Failed"
 msgstr "Falhou a entrega da mensagem"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,field_description:mail.field_ir_model__is_mail_thread
 #: model:ir.ui.view,arch_db:mail.model_search_view
 msgid "Mail Thread"
 msgstr "Conversa do Email"
@@ -2892,7 +2716,7 @@ msgid "Mail Tracking Value"
 msgstr "Valor de Rastreamento de E-mail"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_notification
+#: model:ir.model.fields,help:mail.field_mail_mail__notification
 msgid "Mail has been created to notify people of an existing mail.message"
 msgstr "Mensagens foram criadas para notificar as pessoas."
 
@@ -2904,7 +2728,7 @@ msgid "Mail: Email Queue Manager"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:832
+#: code:addons/mail/models/mail_thread.py:813
 #, python-format
 msgid "Mailbox unavailable - %s"
 msgstr ""
@@ -2923,14 +2747,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all as read"
 msgstr "Marcar todas como lidas"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all read"
 msgstr "Marcar como lidas"
@@ -2942,15 +2766,15 @@ msgstr "Marcar como Concluído"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:206
+#: code:addons/mail/static/src/xml/thread.xml:211
 #, python-format
 msgid "Mark as Read"
 msgstr "Marcar como Lida"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:153
-#: code:addons/mail/static/src/xml/thread.xml:200
+#: code:addons/mail/static/src/xml/thread.xml:158
+#: code:addons/mail/static/src/xml/thread.xml:205
 #, python-format
 msgid "Mark as Todo"
 msgstr "Marcar como Para Fazer"
@@ -2963,12 +2787,12 @@ msgid "Mark as done"
 msgstr "Marcar como Completo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_medium
 msgid "Medium-sized photo"
 msgstr "Foto de tamanho médio"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,help:mail.field_mail_channel__image_medium
 msgid ""
 "Medium-sized photo of the group. It is automatically resized as a 128x128px "
 "image, with aspect ratio preserved. Use this field in form views or some "
@@ -2990,7 +2814,7 @@ msgid "Members"
 msgstr "Membros"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,help:mail.field_mail_channel__group_ids
 msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
@@ -2999,16 +2823,22 @@ msgstr ""
 "Observe que eles poderão gerenciar sua inscrição manualmente se necessário."
 
 #. module: mail
+#: code:addons/mail/wizard/base_partner_merge.py:13
+#, python-format
+msgid "Merged with the following partners:"
+msgstr "Juntar com os seguintes parceiros:"
+
+#. 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.model.fields,field_description:mail.field_mail_mail__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Message"
 msgstr "Mensagem"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
 msgid "Message ID"
 msgstr "ID da Mensagem"
 
@@ -3018,37 +2848,37 @@ msgid "Message Notifications"
 msgstr "Notificações de mensagem"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_mail__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_message__record_name
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__record_name
 msgid "Message Record Name"
 msgstr "Nome do Registro da Mensagem"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__name
 msgid "Message Type"
 msgstr "Tipo de Mensagem"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_to
+#: model:ir.model.fields,help:mail.field_mail_mail__email_to
 msgid "Message recipients (emails)"
 msgstr "Destinatário(E-mail)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_references
+#: model:ir.model.fields,help:mail.field_mail_mail__references
 msgid "Message references, such as identifiers of previous messages"
 msgstr "Referências da mensagem, como identificadores de mensagens anteriores"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
+#: code:addons/mail/static/src/xml/discuss.xml:124
 #, python-format
 msgid "Message sent in \""
 msgstr "Mensagem enviada em \""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__name
 msgid ""
 "Message subtype gives a more precise type on the message, especially for "
 "system notifications. For example, it can be a notification related to a new"
@@ -3068,7 +2898,7 @@ msgid "Message subtypes"
 msgstr "Subtipos de Mensagem"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_followers_subtype_ids
+#: model:ir.model.fields,help:mail.field_mail_followers__subtype_ids
 msgid ""
 "Message subtypes followed, meaning subtypes that will be pushed onto the "
 "user's Wall."
@@ -3077,10 +2907,10 @@ msgstr ""
 "usuário."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,help:mail.field_mail_mail_message_type
-#: model:ir.model.fields,help:mail.field_mail_message_message_type
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,help:mail.field_mail_mail__message_type
+#: model:ir.model.fields,help:mail.field_mail_message__message_type
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_type
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
@@ -3090,87 +2920,88 @@ msgstr ""
 "usuário."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,help:mail.field_mail_mail_message_id
-#: model:ir.model.fields,help:mail.field_mail_message_message_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,help:mail.field_mail_mail__message_id
+#: model:ir.model.fields,help:mail.field_mail_message__message_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_id
 msgid "Message unique identifier"
 msgstr "Identificador da mensagem"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_id
 msgid "Message-Id"
 msgstr "Cód da Mensagem"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_ids
 #: model:ir.ui.menu,name:mail.menu_mail_message
 #: model:ir.ui.view,arch_db:mail.view_message_tree
 msgid "Messages"
@@ -3189,7 +3020,7 @@ msgid "Messages can be <b>starred</b> to remind you to check back later."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__internal
 msgid ""
 "Messages with internal subtypes will be visible only by employees, aka "
 "members of base_user group"
@@ -3198,20 +3029,20 @@ msgstr ""
 "conhecidos como membros do grupo base_user"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_res_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_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
 msgid "Model"
 msgstr "Modelo"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_res_model
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__res_model
 msgid "Model of the followed resource"
 msgstr "Modelo do recurso seguido"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__res_model
 msgid ""
 "Model the subtype applies to. If False, this subtype applies to all models."
 msgstr ""
@@ -3240,25 +3071,25 @@ msgid "My Activities"
 msgstr "Minhas Atividades"
 
 #. 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_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.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Name"
 msgstr "Nome"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_record_name
-#: model:ir.model.fields,help:mail.field_mail_mail_record_name
-#: model:ir.model.fields,help:mail.field_mail_message_record_name
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,help:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,help:mail.field_mail_mail__record_name
+#: model:ir.model.fields,help:mail.field_mail_message__record_name
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__record_name
 msgid "Name get of the related document."
 msgstr "Nome dado ao documento relacionado."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,help:mail.field_mail_template_report_name
+#: model:ir.model.fields,help:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,help:mail.field_mail_template__report_name
 msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
@@ -3267,71 +3098,71 @@ msgstr ""
 "A extensão pode ser omitida e será atribuída pelo tipo de relatório."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_mail_needaction
-#: model:ir.model.fields,help:mail.field_mail_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_mail__needaction
+#: model:ir.model.fields,help:mail.field_mail_message__needaction
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__needaction
 #: model:ir.ui.view,arch_db:mail.view_message_search
 msgid "Need Action"
 msgstr "Necessita ação"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_res_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
 msgid "Needaction Recipient"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:138
+#: code:addons/mail/static/src/xml/discuss.xml:138
 #, python-format
 msgid "New Channel"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:137
+#: code:addons/mail/static/src/xml/discuss.xml:137
 #, python-format
 msgid "New Message"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_char
 msgid "New Value Char"
 msgstr "Novo Valor Char"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_datetime
 msgid "New Value Datetime"
 msgstr "Novo Valor Datetime"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_float
 msgid "New Value Float"
 msgstr "Novo Valor Float"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_integer
 msgid "New Value Integer"
 msgstr "Novo Valor Integer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_monetary
 msgid "New Value Monetary"
 msgstr "Novo Valor Monetário"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_text
 msgid "New Value Text"
 msgstr "Texto do Novo Valor"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:55
-#: code:addons/mail/static/src/js/window_manager.js:139
+#: code:addons/mail/static/src/js/services/chat_manager.js:1625
+#: code:addons/mail/static/src/js/services/chat_window_manager.js:283
 #: code:addons/mail/static/src/xml/systray.xml:12
 #: code:addons/mail/static/src/xml/systray.xml:21
 #, python-format
@@ -3340,21 +3171,21 @@ msgstr "Nova Mensagem"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:233
+#: code:addons/mail/static/src/xml/thread.xml:238
 #, python-format
 msgid "New messages"
 msgstr "Novas mensagens"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:110
+#: code:addons/mail/static/src/xml/thread.xml:115
 #, python-format
 msgid "New messages appear here."
 msgstr "Novas mensagens aparecerão aqui."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:97
+#: code:addons/mail/static/src/js/discuss.js:99
 #, python-format
 msgid "New people"
 msgstr "Novas pessoas"
@@ -3365,85 +3196,85 @@ msgid "Next Activities"
 msgstr "Próximas Atividades"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_date_deadline
 msgid "Next Activity Deadline"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_summary
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_summary
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_summary
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_summary
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_summary
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_summary
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_summary
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_summary
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_summary
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_summary
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_summary
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_summary
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_summary
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_summary
 msgid "Next Activity Summary"
 msgstr "Próximo Sumário de Atividade"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_type_id
 msgid "Next Activity Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,field_description:mail.field_mail_activity__has_recommended_activities
 msgid "Next activities available"
 msgstr ""
 
@@ -3487,28 +3318,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:113
+#: code:addons/mail/static/src/xml/thread.xml:118
 #, python-format
 msgid "No starred message"
 msgstr "Nenhuma mensagem favorita."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__no_auto_thread
 msgid "No threading for answers"
 msgstr "Sem thread para respostas."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_note
+#: model:ir.model.fields,field_description:mail.field_mail_activity__note
 #: model:mail.message.subtype,name:mail.mt_note
 msgid "Note"
 msgstr "Nota"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:157
+#: code:addons/mail/static/src/xml/thread.xml:162
 #, python-format
 msgid "Note by"
 msgstr "Nota por"
@@ -3519,249 +3350,254 @@ msgid "Notification"
 msgstr "Notificação"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_users_notification_type
+#: model:ir.model.fields,field_description:mail.field_res_users__notification_type
 msgid "Notification Management"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_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 "Notificações"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers"
 msgstr "Notificar seguidores"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_notify
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_notify
+#: model:ir.model.fields,help:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers of the document (mass post only)"
 msgstr "Notificar seguidores do documento"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of Actions"
 msgstr "Número de ações"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_days
+#: 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_payment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of messages which requires an action"
 msgstr "Número de mensagens que requer uma ação"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread_counter
 msgid "Number of unread messages"
 msgstr "Quantidade de mensagens não lidas."
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model:ir.ui.view,arch_db:mail.message_notification_email
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Odoo"
 msgstr "Odoo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:895
+#: code:addons/mail/static/src/js/discuss.js:910
 #, python-format
 msgid ""
 "Odoo has now the permission to send you native notifications on this device."
@@ -3769,14 +3605,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "Odoo needs your permission to"
 msgstr "Odoo necessita de sua permissão para"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:892
+#: code:addons/mail/static/src/js/discuss.js:907
 #, python-format
 msgid ""
 "Odoo will not have the permission to send native notifications on this "
@@ -3785,38 +3621,38 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:120
+#: code:addons/mail/static/src/xml/discuss.xml:120
 #, python-format
 msgid "Offline"
 msgstr "Offline"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_char
 msgid "Old Value Char"
 msgstr "Antigo Valor Char"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_datetime
 msgid "Old Value DateTime"
 msgstr "Antigo Valor DateTime"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_float
 msgid "Old Value Float"
 msgstr "Antigo Valor Float"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_integer
 msgid "Old Value Integer"
 msgstr "Antigo Valor Integer"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_monetary
 msgid "Old Value Monetary"
 msgstr "Antigo Valor Monetary"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_text
 msgid "Old Value Text"
 msgstr "Antigo Valor Text"
 
@@ -3843,14 +3679,14 @@ msgstr "Um seguidor"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:118
-#: code:addons/mail/static/src/xml/client_action.xml:202
+#: code:addons/mail/static/src/xml/discuss.xml:118
+#: code:addons/mail/static/src/xml/discuss.xml:202
 #, python-format
 msgid "Online"
 msgstr "Online"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:22
+#: code:addons/mail/models/ir_model.py:28
 #, python-format
 msgid "Only custom models can be modified."
 msgstr "Somente modelos personalizados podem ser modificados."
@@ -3872,14 +3708,14 @@ msgstr "Abrir documento principal"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Open channel settings"
 msgstr "Abrir configurações de canal"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:187
+#: code:addons/mail/static/src/xml/discuss.xml:187
 #, python-format
 msgid "Open chat"
 msgstr "Abrir chat"
@@ -3892,15 +3728,15 @@ 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
+#: 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"
 msgstr "Desistência"
 
 #. module: mail
-#: 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_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
 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 "
@@ -3911,8 +3747,8 @@ msgstr ""
 "ele desabilitará a criação de novos registros completamente."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,help:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,help:mail.field_mail_template__mail_server_id
 msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
@@ -3921,14 +3757,14 @@ msgstr ""
 "servidor com maior prioridade será usado."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_template
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_template
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_template
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_template
 msgid "Optional report to print and attach"
 msgstr "Relatório opcional para exibir e anexar"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_lang
-#: model:ir.model.fields,help:mail.field_mail_template_lang
+#: model:ir.model.fields,help:mail.field_email_template_preview__lang
+#: model:ir.model.fields,help:mail.field_mail_template__lang
 msgid ""
 "Optional translation language (ISO code) to select when sending out an "
 "email. If not set, the english version will be used. This should usually be "
@@ -3941,8 +3777,8 @@ msgstr ""
 "por exemplo, ${object.partner_id.lang}."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,help:mail.field_mail_template_null_value
+#: model:ir.model.fields,help:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,help:mail.field_mail_template__null_value
 msgid "Optional value to use if the target field is empty"
 msgstr "Valor opcional a ser usado se o campo estiver vazio"
 
@@ -3957,8 +3793,8 @@ msgid "Outgoing"
 msgstr "Enviando"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__mail_server_id
 msgid "Outgoing Mail Server"
 msgstr "Servidor de E-mail de Saída"
 
@@ -3968,10 +3804,10 @@ msgid "Outgoing Mails"
 msgstr "E-mails Enviados"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_server_id
 msgid "Outgoing mail server"
 msgstr "Servidor de envio"
 
@@ -3985,12 +3821,12 @@ msgstr "Servidor de envio"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4004,43 +3840,43 @@ msgid "Override author's email"
 msgstr "Sobrescrever o e-mail do autor"
 
 #. module: mail
-#: 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_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
 msgid "Owner"
 msgstr "Proprietário"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__parent_id
 msgid "Parent"
 msgstr "Superior (Conta-pai)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__parent_id
 msgid "Parent Message"
 msgstr "Mensagem Principal"
 
 #. module: mail
-#: 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_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
 msgid "Parent Model"
 msgstr "Modelo Principal"
 
 #. module: mail
-#: 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_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
 msgid "Parent Record Thread ID"
 msgstr "ID de Registro Pai da Linha"
 
 #. module: mail
-#: 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_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
 msgid ""
 "Parent model holding the alias. The model holding the alias reference is not"
 " necessarily the model given by alias_model_id (example: project "
@@ -4051,7 +3887,7 @@ msgstr ""
 "(example: project (parent_model) and task (model))"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__parent_id
 msgid ""
 "Parent subtype, used for automatic subscription. This field is not correctly"
 " named. For example on a project, the parent_id of project subtypes refers "
@@ -4080,43 +3916,43 @@ msgstr ""
 "em massa"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction_partner_ids
 msgid "Partners with Need Action"
 msgstr "Parceiros com a Necessidade de Ação"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_template__auto_delete
 msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 "Excluir permanentemente este e-mail depois do envio, para economizar espaço"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:891
+#: code:addons/mail/static/src/js/discuss.js:906
 #, python-format
 msgid "Permission denied"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:894
+#: code:addons/mail/static/src/js/discuss.js:909
 #, python-format
 msgid "Permission granted"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image
 msgid "Photo"
 msgstr "Foto"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,field_description:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,field_description:mail.field_mail_template__copyvalue
 msgid "Placeholder Expression"
 msgstr "Espaço da Expressão"
 
@@ -4130,12 +3966,12 @@ msgstr "Espaço da Expressão"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4151,46 +3987,56 @@ msgid "Planned activities"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__days
+msgid "Planned in"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:282
+#: code:addons/mail/static/src/xml/thread.xml:287
 #, python-format
 msgid "Play this video"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:158
+#: code:addons/mail/static/src/js/chatter_composer.js:157
 #, python-format
 msgid "Please complete customer's informations"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:84
+#: code:addons/mail/static/src/js/many2many_tags_email.js:96
 #, python-format
 msgid "Please complete customer's informations and email"
 msgstr ""
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Please contact us instead using"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Please, wait while the file is uploading."
 msgstr "Por favor, aguarde enquanto o arquivo está sendo carregado."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_notification_type
+#: model:ir.model.fields,help:mail.field_res_users__notification_type
 msgid ""
 "Policy on how to handle Chatter notifications:\n"
-"- Emails: notifications are sent to your email\n"
-"- Odoo: notifications appear in your Odoo Inbox"
+"- Handle by Emails: notifications are sent to your email address\n"
+"- Handle in Odoo: notifications appear in your Odoo Inbox"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_alias_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_channel_alias_contact
-#: model:ir.model.fields,help:mail.field_res_users_alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_channel__alias_contact
+#: model:ir.model.fields,help:mail.field_res_users__alias_contact
 msgid ""
 "Policy to post a message on the document using the mailgateway.\n"
 "- everyone: everyone can post\n"
@@ -4203,12 +4049,13 @@ msgstr ""
 "- Seguidores: apenas seguidores do documento relacionado ou membros dos seguintes canais\n"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Powered by"
 msgstr "Desenvolvido por"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_previous_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__previous_type_ids
 msgid "Preceding Activities"
 msgstr ""
 
@@ -4218,8 +4065,8 @@ msgid "Preferred reply address"
 msgstr "E-mail de resposta preferencial"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,help:mail.field_mail_template_reply_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,help:mail.field_mail_template__reply_to
 msgid "Preferred response address (placeholders may be used here)"
 msgstr "Endereço de resposta preferido (placeholders podem ser usados aqui)"
 
@@ -4234,27 +4081,27 @@ msgid "Preview of"
 msgstr "Visualização de"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_previous_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__previous_activity_type_id
 msgid "Previous Activity Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_public
+#: model:ir.model.fields,field_description:mail.field_mail_channel__public
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Privacy"
 msgstr "Privacidade"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:56
-#: code:addons/mail/static/src/xml/client_action.xml:176
+#: code:addons/mail/static/src/xml/discuss.xml:56
+#: code:addons/mail/static/src/xml/discuss.xml:176
 #, python-format
 msgid "Private Channels"
 msgstr "Canais Privados"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:848
+#: code:addons/mail/static/src/js/discuss.js:863
 #, python-format
 msgid "Public Channels"
 msgstr "Canais Públicos"
@@ -4283,68 +4130,72 @@ msgid "Received"
 msgstr "Recebido"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_id
 msgid "Recipient"
 msgstr "Destinatário"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Recipients"
 msgstr "Destinatários"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_recommended_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__recommended_activity_type_id
 msgid "Recommended Activity Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_next_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__next_type_ids
 msgid "Recommended Next Activities"
 msgstr ""
 
 #. module: mail
-#: 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_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
 msgid "Record Thread ID"
 msgstr "Id do Registro do Tópico"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_references
+#: model:ir.model.fields,field_description:mail.field_mail_mail__references
 msgid "References"
 msgstr "Referências"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_res_id
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Regards,"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__res_id
 msgid "Related Document ID"
 msgstr "ID do 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_mail_model
-#: model:ir.model.fields,field_description:mail.field_mail_message_model
-#: model:ir.model.fields,field_description:mail.field_mail_template_model
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_model
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_model
+#: 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_compose_message__model
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_model
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__model
 msgid "Related Document Model"
 msgstr "Modelo de Documento Relacionado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_model
 msgid "Related Document Model Name"
 msgstr ""
 
@@ -4354,12 +4205,12 @@ msgid "Related Message"
 msgstr "Mensagem Relacionada"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__partner_id
 msgid "Related Partner"
 msgstr "Parceiro Relacionado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__relation_field
 msgid "Relation field"
 msgstr "Campo da relação"
 
@@ -4378,17 +4229,17 @@ msgstr "Remover este seguidor"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:203
+#: code:addons/mail/static/src/xml/thread.xml:208
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Reply"
 msgstr "Responder"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,help:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,help:mail.field_mail_message_reply_to
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,help:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,help:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,help:mail.field_mail_message__reply_to
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__reply_to
 msgid ""
 "Reply email address. Setting the reply_to bypasses the automatic thread "
 "creation."
@@ -4397,46 +4248,46 @@ msgstr ""
 "automático."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_reply_to
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__reply_to
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__reply_to
 msgid "Reply-To"
 msgstr "Responder Para"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_name
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_name
 msgid "Report Filename"
 msgstr "Nome do Arquivo de Relatório"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_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 "Responsável"
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_user_id
+msgid "Responsible User"
+msgstr "Usuário Responsável"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
@@ -4445,12 +4296,12 @@ msgid "Retry"
 msgstr "Repetir"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body_html
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body_html
 msgid "Rich-text Contents"
 msgstr "Conteúdo Rich-text"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_body_html
+#: model:ir.model.fields,help:mail.field_mail_mail__body_html
 msgid "Rich-text/HTML message"
 msgstr "Mensagem com formatação Rich-text/HTML"
 
@@ -4460,7 +4311,7 @@ msgid "SMTP Server"
 msgstr "Servidor SMTP"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_res_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__res_id
 msgid "Sample Document"
 msgstr "Exemplo de Documentos"
 
@@ -4494,26 +4345,26 @@ msgid "Schedule activity"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:250
+#: code:addons/mail/models/mail_activity.py:260
 #, python-format
 msgid "Schedule an Activity"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:57
 #, 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
+#: 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"
 msgstr "Data Programada"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__scheduled_date
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Scheduled Send Date"
 msgstr ""
@@ -4529,8 +4380,8 @@ msgid "Search Groups"
 msgstr "Procurar grupos"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__model_object_field
 msgid ""
 "Select target field from the related document model.\n"
 "If it is a relationship field you will be able to select a target field at the destination of the relationship."
@@ -4545,19 +4396,19 @@ msgstr "Selecionar grupo de usuários"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:374
+#: code:addons/mail/static/src/js/composer.js:428
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Send"
 msgstr "Enviar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail
 msgid "Send Email"
 msgstr "Enviar E-mail"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:264
+#: code:addons/mail/models/mail_template.py:295
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Enviar E-mail (%s)"
@@ -4583,13 +4434,13 @@ msgid "Send message"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
+#: model:ir.model.fields,field_description:mail.field_mail_channel__email_send
 msgid "Send messages by email"
 msgstr "Enviar mensagens por e-mail"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_from
-#: model:ir.model.fields,help:mail.field_mail_template_email_from
+#: model:ir.model.fields,help:mail.field_email_template_preview__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 "
 "value will be the author's email alias if configured, or email address."
@@ -4600,14 +4451,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Sending Error"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:108
+#: code:addons/mail/static/src/xml/discuss.xml:108
 #, python-format
 msgid "Sends messages by email"
 msgstr "Envia mensagens por e-mail"
@@ -4619,25 +4470,30 @@ msgid "Sent"
 msgstr "Enviado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_email
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "Sent by"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_email
 msgid "Sent by Email"
 msgstr "Enviado por email"
 
 #. 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
+#: 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 "Seqüência"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Settings"
 msgstr "Configurações"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__shortcode_type
 msgid "Shortcode Type"
 msgstr ""
 
@@ -4648,7 +4504,7 @@ msgid "Shortcodes"
 msgstr "Códigos Curtos"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__source
 msgid "Shortcut"
 msgstr "Atalho"
 
@@ -4660,20 +4516,20 @@ msgstr ""
 "Mostrar todas as gravações em que a próxima data de ação seja antes de hoje."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:667
+#: code:addons/mail/models/mail_channel.py:673
 #, python-format
 msgid "Show an helper message"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,field_description:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_mail_template__ref_ir_act_window
 msgid "Sidebar action"
 msgstr "Ação da Barra Lateral"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,help:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_mail_template__ref_ir_act_window
 msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
@@ -4682,10 +4538,10 @@ msgstr ""
 "de modelos de documentos relacionados"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_avatar
 msgid ""
 "Small-sized image of this contact. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4697,12 +4553,12 @@ msgstr ""
 "necessária."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_small
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_small
 msgid "Small-sized photo"
 msgstr "Foto pequena"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_small
+#: model:ir.model.fields,help:mail.field_mail_channel__image_small
 msgid ""
 "Small-sized photo of the group. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4718,7 +4574,7 @@ msgid "Smiley"
 msgstr "Smiley"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_res_model_id
+#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_id
 msgid ""
 "Specify a model if the activity should be specific to a model and not "
 "available when managing activities for other models."
@@ -4726,74 +4582,52 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:661
-#: code:addons/mail/static/src/xml/client_action.xml:28
-#: code:addons/mail/static/src/xml/client_action.xml:156
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred
+#: code:addons/mail/static/src/js/services/chat_manager.js:89
+#: code:addons/mail/static/src/xml/discuss.xml:28
+#: code:addons/mail/static/src/xml/discuss.xml:156
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred
 #, python-format
 msgid "Starred"
 msgstr "Favoritos"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_state
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_state
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_mail_activity__state
 msgid "State"
 msgstr "Estado"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_state
+#: 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
 msgid "Status"
 msgstr "Situação"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,help:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,help:mail.field_event_track_activity_state
-#: model:ir.model.fields,help:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,help:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,help:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,help:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,help:mail.field_product_template_activity_state
-#: model:ir.model.fields,help:mail.field_project_task_activity_state
-#: model:ir.model.fields,help:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,help:mail.field_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
+#: model:ir.model.fields,help:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,help:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,help:mail.field_event_track__activity_state
+#: model:ir.model.fields,help:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,help:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,help:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,help:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,help:mail.field_note_note__activity_state
+#: model:ir.model.fields,help:mail.field_product_product__activity_state
+#: model:ir.model.fields,help:mail.field_product_template__activity_state
+#: model:ir.model.fields,help:mail.field_project_task__activity_state
+#: model:ir.model.fields,help:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,help:mail.field_repair_order__activity_state
+#: model:ir.model.fields,help:mail.field_res_partner__activity_state
+#: model:ir.model.fields,help:mail.field_res_users__activity_state
+#: model:ir.model.fields,help:mail.field_sale_order__activity_state
+#: model:ir.model.fields,help:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,help:mail.field_survey_survey__activity_state
 msgid ""
 "Status based on activities\n"
 "Overdue: Due date is already passed\n"
@@ -4802,33 +4636,33 @@ msgid ""
 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
+#: 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"
 msgstr "Sub-Campo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,field_description:mail.field_mail_template_sub_object
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,field_description:mail.field_mail_template__sub_object
 msgid "Sub-model"
 msgstr "Sub-modelo"
 
 #. module: mail
 #. 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_mail_compose_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_mail_subject
-#: model:ir.model.fields,field_description:mail.field_mail_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_template_subject
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subject
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__subject
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_mail__subject
+#: model:ir.model.fields,field_description:mail.field_mail_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_template__subject
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subject
 #, python-format
 msgid "Subject"
 msgstr "Assunto"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_subject
-#: model:ir.model.fields,help:mail.field_mail_template_subject
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr "Assunto (placeholders podem ser usados aqui)"
@@ -4840,22 +4674,22 @@ msgstr "Assunto..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:216
+#: code:addons/mail/static/src/xml/thread.xml:221
 #, python-format
 msgid "Subject:"
 msgstr "Assunto:"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_substitution
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__substitution
 msgid "Substitution"
 msgstr "Substituição"
 
 #. module: mail
-#: 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_1993
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subtype_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subtype_id
 #: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
 msgid "Subtype"
 msgstr "Subtipo"
@@ -4867,8 +4701,8 @@ msgid "Subtypes"
 msgstr "Subtipos"
 
 #. 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
+#: 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 "Resumo"
 
@@ -4880,7 +4714,7 @@ msgid "System notification"
 msgstr "Notificação do sistema"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,help:mail.field_mail_activity__has_recommended_activities
 msgid "Technical field for UX purpose"
 msgstr ""
 
@@ -4890,6 +4724,14 @@ msgid "Template Preview"
 msgstr "Visualizar Modelo"
 
 #. module: mail
+#: code:addons/mail/models/mail_template.py:264
+#, python-format
+msgid ""
+"Template rendering failed, this could mean that your template contains "
+"python syntax errors"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_template_tree_all
 #: model:ir.ui.menu,name:mail.menu_email_templates
 #: model:ir.ui.view,arch_db:mail.email_template_form
@@ -4899,14 +4741,24 @@ msgid "Templates"
 msgstr "Modelos"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The"
+msgstr "O"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The email sent to"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_shortcode__substitution
 msgid "The escaped html code replacing the shortcut"
 msgstr ""
 
 #. module: mail
-#: 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_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
 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 "
@@ -4917,9 +4769,9 @@ msgstr ""
 "criação de um novo registro desse modelo (e.g. a Project Task)"
 
 #. module: mail
-#: 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_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
 msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
@@ -4928,9 +4780,9 @@ msgstr ""
 "e-mails para <empregos@suaempresa.com.br>"
 
 #. module: mail
-#: 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_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
 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 "
@@ -4944,9 +4796,9 @@ msgstr ""
 " endereço."
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:165
-#: code:addons/mail/models/mail_message.py:579
-#: code:addons/mail/models/mail_message.py:674
+#: code:addons/mail/models/mail_activity.py:175
+#: code:addons/mail/models/mail_message.py:578
+#: code:addons/mail/models/mail_message.py:678
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -4957,18 +4809,18 @@ msgstr ""
 "(Tipo de documento: %s, Operation: %s)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__source
 msgid "The shortcut which must be replaced in the Chat Messages"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__unicode_source
 msgid "The source is replaced by this unicode character in the Chat Messages"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,help:mail.field_mail_template_model_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,help:mail.field_mail_template__model_id
 msgid "The type of document this template can be used with"
 msgstr ""
 
@@ -4978,7 +4830,7 @@ msgid "This"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image
+#: model:ir.model.fields,help:mail.field_mail_channel__image
 msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
@@ -4987,7 +4839,7 @@ msgstr ""
 "1024x1024px."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_public
+#: model:ir.model.fields,help:mail.field_mail_channel__public
 msgid ""
 "This group is visible by non members. Invisible groups can add members "
 "through the invite button."
@@ -5001,20 +4853,20 @@ msgid "Thread"
 msgstr "Tópico"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_to
 msgid "To"
 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_mail_template_email_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_to
 msgid "To (Emails)"
 msgstr "Para (E-mails)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_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
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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)"
 msgstr "Para (Parceiros)"
 
@@ -5029,8 +4881,8 @@ msgstr "Para:"
 #. module: mail
 #. openerp-web
 #: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:25
-#: code:addons/mail/static/src/js/thread.js:242
+#: code:addons/mail/static/src/js/activity.js:82
+#: code:addons/mail/static/src/js/thread.js:328
 #: code:addons/mail/static/src/xml/systray.xml:75
 #: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
 #: selection:hr.applicant,activity_state:0
@@ -5040,12 +4892,12 @@ msgstr "Para:"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -5067,7 +4919,7 @@ msgstr "À Fazer"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:35
+#: code:addons/mail/static/src/js/activity.js:92
 #, python-format
 msgid "Tomorrow"
 msgstr "Amanhã"
@@ -5078,17 +4930,17 @@ msgid "Topics discussed in this group..."
 msgstr "Tópicos discutidos neste grupo..."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid ""
 "Tracked values are stored in a separate model. This field allow to "
 "reconstruct the tracking and to generate statistics on the model."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,field_description:mail.field_ir_model_fields__track_visibility
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Tracking"
 msgstr "Acompanhamento"
@@ -5106,28 +4958,28 @@ msgid "Tracking Values"
 msgstr "Valores de Rastreamentos"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid "Tracking values"
 msgstr "Valores de Rastreamento"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_type
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_type
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_uuid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__uuid
 msgid "UUID"
 msgstr "UUID"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:235
+#: code:addons/mail/models/mail_mail.py:233
 #, python-format
 msgid "Unable to connect to SMTP Server"
 msgstr ""
@@ -5140,7 +4992,6 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:700
 #: code:addons/mail/static/src/xml/followers.xml:22
 #, python-format
 msgid "Unfollow"
@@ -5155,143 +5006,145 @@ msgstr ""
 "outro que seja exclusivo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__unicode_source
 msgid "Unicode Character"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread
 msgid "Unread Messages"
 msgstr "Mensagens não lidas"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread_counter
 msgid "Unread Messages Counter"
 msgstr "Contador de Mensagens Não Lidas"
 
@@ -5302,61 +5155,61 @@ msgstr "Mensagens não lidas"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all"
 msgstr "Remover favorito de tudo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all messages"
 msgstr "Remover estrela de todas as mensagens"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe"
 msgstr "Cancelar a inscrição"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe from channel"
 msgstr "Cancelar a assinatura de canal"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:510
+#: code:addons/mail/models/mail_template.py:504
 #, python-format
 msgid "Unsupported report type %s found."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:322
+#: code:addons/mail/static/src/xml/thread.xml:327
 #, python-format
 msgid "Uploading"
 msgstr "Enviando"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Uploading error"
 msgstr "Erro no upload"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_use_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_use_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__use_active_domain
 msgid "Use active domain"
 msgstr "Utilizar domínio ativo"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_template_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_template_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__template_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__template_id
 msgid "Use template"
 msgstr "Usar modelo"
 
@@ -5366,7 +5219,7 @@ msgid "Use your own email servers"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_sequence
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__sequence
 msgid "Used to order subtypes."
 msgstr "Utilizar para os demais subtipos"
 
@@ -5379,7 +5232,7 @@ msgstr "Usuário"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:51
+#: code:addons/mail/static/src/xml/discuss.xml:51
 #: code:addons/mail/static/src/xml/extended_chat_window.xml:8
 #, python-format
 msgid "User name"
@@ -5391,7 +5244,7 @@ msgid "Users"
 msgstr "Usuários"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:711
+#: code:addons/mail/models/mail_channel.py:717
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5405,14 +5258,14 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:670
+#: code:addons/mail/models/mail_thread.py:696
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 #, python-format
 msgid "View"
 msgstr "Vista"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:668
+#: code:addons/mail/models/mail_thread.py:694
 #, python-format
 msgid "View %s"
 msgstr ""
@@ -5431,8 +5284,8 @@ msgstr ""
 "Você realmente deseja remover esse seguidor?"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_sub_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__sub_model_object_field
 msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
@@ -5442,8 +5295,8 @@ msgstr ""
 "destino (sub-modelo)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,help:mail.field_mail_template_sub_object
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,help:mail.field_mail_template__sub_object
 msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
@@ -5452,7 +5305,7 @@ msgstr ""
 "exibirá o modelo que o relacionamento levará"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,help:mail.field_ir_model_fields__track_visibility
 msgid ""
 "When set, every modification to this field will be tracked in the chatter."
 msgstr ""
@@ -5460,13 +5313,13 @@ msgstr ""
 "chatter."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_is_log
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_is_log
+#: model:ir.model.fields,help:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__is_log
 msgid "Whether the message is an internal note (comment mode only)"
 msgstr "Se a mensagem é uma nota interna(somente modo comentário)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,help:mail.field_ir_model__is_mail_thread
 msgid "Whether this model supports messages and notifications."
 msgstr "Se esse modelo suporta mensagens e notificações"
 
@@ -5484,47 +5337,47 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:12
+#: code:addons/mail/static/src/xml/composer.xml:11
 #, python-format
-msgid "Write something..."
-msgstr "Escreva algo..."
+msgid "Write Something..."
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:29
-#: code:addons/mail/static/src/js/thread.js:244
+#: code:addons/mail/static/src/js/activity.js:86
+#: code:addons/mail/static/src/js/thread.js:330
 #, python-format
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:96
+#: code:addons/mail/static/src/js/discuss.js:98
 #, python-format
 msgid "You added <b>%s</b> to the conversation."
 msgstr "Você adicionou <b>%s</b> para a conversa."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:708
+#: code:addons/mail/models/mail_channel.py:714
 #, python-format
 msgid "You are alone in this channel."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:677
+#: code:addons/mail/models/mail_channel.py:683
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:672
+#: code:addons/mail/models/mail_channel.py:678
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:114
+#: code:addons/mail/static/src/xml/thread.xml:119
 #, python-format
 msgid ""
 "You can mark any message as 'starred', and it shows up in this channel."
@@ -5532,7 +5385,7 @@ msgstr ""
 "Você pode marcar qualquer mensagem como 'favorita', e exibi-la neste canal."
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:54
+#: code:addons/mail/models/res_users.py:53
 #, python-format
 msgid ""
 "You cannot create a new user from here.\n"
@@ -5551,14 +5404,11 @@ msgstr ""
 "Você não pode excluir estes grupos. Eles são necessários à outros módulos."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:349
+#: code:addons/mail/models/mail_thread.py:342
 #, python-format
 msgid ""
-"You could also add a new %(document)s by sending an email to: "
-"%(email_link)s."
+"You could also add a new %(document)s by sending an email to %(email_link)s"
 msgstr ""
-"Você pode adicionar um novo %(document)s enviando um e-mail para: "
-"%(email_link)s."
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
@@ -5567,14 +5417,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "You have been invited to: "
 msgstr "Você foi convidado para:"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,help:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_template__attachment_ids
 msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
@@ -5584,28 +5434,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:473
+#: code:addons/mail/static/src/js/services/chat_manager.js:1536
 #, 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:471
+#: code:addons/mail/static/src/js/services/chat_manager.js:1534
 #, python-format
 msgid "You unsubscribed from <b>%s</b>."
 msgstr "Você foi descadastrado de <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:217
+#: code:addons/mail/static/src/xml/discuss.xml:217
 #, python-format
 msgid "You:"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Your message has not been sent."
 msgstr ""
@@ -5617,23 +5467,35 @@ msgid "Your template should define email_from"
 msgstr "Seu modelo deve definir email_from"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "alias %s: %s"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
+msgid "base.partner.merge.automatic.wizard"
+msgstr "base.partner.merge.automatic.wizard"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "by"
 msgstr "por"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid ""
+"cannot be processed. This address\n"
+"    is used to collect replies and should not be used to directly contact"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:315
+#: code:addons/mail/models/mail_thread.py:309
 #, python-format
 msgid "document"
 msgstr "documento"
@@ -5652,7 +5514,7 @@ msgstr "por exemplo, Discutir proposta"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "enable desktop notifications"
 msgstr "habilitar notificações na área de trabalho"
@@ -5687,13 +5549,13 @@ msgid "has been"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:282
+#: code:addons/mail/models/mail_alias.py:271
 #, python-format
 msgid "incorrectly configured alias"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:278
+#: code:addons/mail/models/mail_alias.py:267
 #, python-format
 msgid "incorrectly configured alias (unknown reference record)"
 msgstr ""
@@ -5714,19 +5576,19 @@ msgid "mail.alias.mixin"
 msgstr "mail.alias.mixin"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:943
+#: code:addons/mail/models/mail_thread.py:925
 #, python-format
 msgid "model %s does not accept document creation"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:938
+#: code:addons/mail/models/mail_thread.py:920
 #, python-format
 msgid "model %s does not accept document update"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:931
+#: code:addons/mail/models/mail_thread.py:913
 #, python-format
 msgid ""
 "model %s does not accept document update, fall back on document creation"
@@ -5751,14 +5613,14 @@ msgstr "agora"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:177
+#: code:addons/mail/static/src/xml/thread.xml:181
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "on"
 msgstr "em"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid ""
 "posting a message without model should be with a null res_id (private "
@@ -5766,7 +5628,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:917
+#: code:addons/mail/models/mail_thread.py:899
 #, python-format
 msgid ""
 "posting a message without model should be with a parent_id (private message)"
@@ -5797,13 +5659,13 @@ msgid "record:"
 msgstr "registro:"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:935
+#: code:addons/mail/models/mail_thread.py:917
 #, python-format
 msgid "reply to missing document (%s,%s)"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:928
+#: code:addons/mail/models/mail_thread.py:910
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
 msgstr ""
@@ -5814,40 +5676,45 @@ msgid "res.config.settings"
 msgstr "res.config.settings"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid "resetting thread_id"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:254
+#: code:addons/mail/models/mail_channel.py:252
 #, python-format
 msgid "restricted to channel members"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:287
+#: code:addons/mail/models/mail_alias.py:276
 #, python-format
 msgid "restricted to followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:291
+#: code:addons/mail/models/mail_alias.py:280
 #, python-format
 msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:899
 #: code:addons/mail/models/mail_thread.py:917
-#: code:addons/mail/models/mail_thread.py:935
-#: code:addons/mail/models/mail_thread.py:938
-#: code:addons/mail/models/mail_thread.py:943
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:920
+#: code:addons/mail/models/mail_thread.py:925
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "skipping"
 msgstr "pulando"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "team."
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:20
 #, python-format
@@ -5855,13 +5722,18 @@ msgid "this document"
 msgstr "este documento"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "unknown error"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:906
+#: code:addons/mail/models/mail_thread.py:888
 #, python-format
 msgid "unknown target model %s"
 msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "using"
+msgstr ""
diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po
index d54fa866b48..c5afe3e89e0 100644
--- a/addons/mail/i18n/ru.po
+++ b/addons/mail/i18n/ru.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Masha Koc <mariya.kos.ua@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Alex Puchkov <ap@alteco.co>, 2017
 # Gennady Marchenko <gennadym@gmail.com>, 2017
 # Viktor Pogrebniak <vp@aifil.ru>, 2017
 # Max Belyanin <maxbelyanin@gmail.com>, 2017
 # Максим Дронь <dronmax@gmail.com>, 2017
-# Эдуард Манятовский <manyatovskiy@gmail.com>, 2017
+# Collex100, 2017
 # Sergey Vilizhanin <sv@grimmette.ru>, 2017
 # Владимир Куряев <istercul@gmail.com>, 2017
 # Denis Trepalin <zekarious@gmail.com>, 2017
@@ -18,13 +18,14 @@
 # OstapYakovenko <Ostap.Yakovenko@gmail.com>, 2017
 # Denis Baranov <baranov@itlibertas.com>, 2017
 # VItaly Skopin <skopin@lab49.ru>, 2017
+# sergeiruzkiicode <sergei.ruzki@icode.by>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.1\n"
+"Project-Id-Version: Odoo Server saas~11.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-13 14:36+0000\n"
-"PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: VItaly Skopin <skopin@lab49.ru>, 2017\n"
+"POT-Creation-Date: 2018-03-22 14:10+0000\n"
+"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"Last-Translator: sergeiruzkiicode <sergei.ruzki@icode.by>, 2018\n"
 "Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,168 +34,59 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_data_notification_email_default
-msgid ""
-"\n"
-"% set company = ctx.get('company', user.company_id)\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"
-"        <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-"        <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
-"    </div>\n"
-"</div>\n"
-"% endif\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('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('has_button_follow'):\n"
-"        % if ctx.get('has_button_access'):\n"
-"           |\n"
-"        % endif\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=\"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=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
-"        % endfor\n"
-"        % endif\n"
-"    </td>\n"
-"    <td valign=\"center\" align=\"right\">\n"
-"        <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\">\n"
-"    </td>\n"
-"</tr>\n"
-"<tr>\n"
-"    <td colspan=\"2\" style=\"text-align:center;\">\n"
-"        <hr width=\"100%\"\n"
-"            style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
-"        % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
-"        <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n"
-"            <strong>Internal communication</strong>: Replying will post an internal note. Followers won't receive any email notification.\n"
-"        </p>\n"
-"        % endif\n"
-"    </td>\n"
-"</tr>\n"
-"</tbody></table>\n"
-"</div>\n"
-"% endif\n"
-"<div>\n"
-"    ${object.body | safe}\n"
-"</div>\n"
-"% if ctx.get('tracking'):\n"
-"    <ul>\n"
-"    % for tracking in ctx['tracking']\n"
-"        <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
-"    % endfor\n"
-"    </ul>\n"
-"% endif\n"
-"\n"
-"% if ctx.get('signature'):\n"
-"    ${ctx['signature'] | safe}\n"
-"% endif\n"
-"<br/>\n"
-"<p style=\"color: #555555;\">\n"
-"    Sent by\n"
-"    % if ctx.get('website_url'):\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 target=\"_blank\" 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:674
+#: code:addons/mail/models/mail_channel.py:680
 #, 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) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-msgstr ""
-"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:63
+#: code:addons/mail/static/src/js/services/chat_manager.js:1634
 #, python-format
 msgid "%d Messages"
 msgstr "%d сообщений"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:31
+#: code:addons/mail/static/src/js/activity.js:88
 #, python-format
 msgid "%d days overdue"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:248
+#: code:addons/mail/models/mail_template.py:279
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (копия)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:236
+#: code:addons/mail/models/mail_thread.py:234
 #, python-format
 msgid "%s created"
 msgstr "%s создано"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:81
+#: code:addons/mail/models/res_users.py:80
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s присоединился к сети %s."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:211
 #, python-format
 msgid "&nbsp;("
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:179
+#: code:addons/mail/static/src/xml/thread.xml:184
 #, python-format
 msgid "(from"
 msgstr "(от"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,help:mail.field_mail_shortcode__shortcode_type
 msgid ""
 "* Smiley are only used for HTML code to display an image * Text (default "
 "value) is used to substitute text with another text"
@@ -211,7 +103,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:331
+#: code:addons/mail/static/src/xml/thread.xml:336
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr "-------- Показать старые сообщения --------"
@@ -238,7 +130,7 @@ msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:684
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -254,7 +146,16 @@ msgstr ""
 "            Готовые ответы можно вставить в ваше сообщение, набрав <b>: сокращение</b>.<br>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:584
+#: code:addons/mail/models/mail_channel.py:507
+#, python-format
+msgid ""
+"<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
+"href=\"#\" class=\"o_channel_redirect\" data-oe-"
+"id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:590
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -264,8 +165,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:508
-#: code:addons/mail/models/mail_channel.py:561
+#: code:addons/mail/models/mail_channel.py:514
+#: code:addons/mail/models/mail_channel.py:567
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -389,6 +290,11 @@ msgstr ""
 "class=\"o_stat_text\">Контекст</span>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+msgid "<span class=\"oe_inline\">days</span>"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>\n"
@@ -405,6 +311,13 @@ msgid "<strong> Feedback</strong>"
 msgstr ""
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid ""
+"<strong>Internal communication</strong>: Replying will post an internal "
+"note. Followers won't receive any email notification."
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>Only records checked in list view will be used.</strong><br/>\n"
@@ -417,9 +330,9 @@ msgid "<strong>Recommended Activities</strong>"
 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_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
 msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
@@ -442,115 +355,118 @@ msgid "Access Groups"
 msgstr "Группы доступа"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction
 msgid "Action Needed"
 msgstr "Требует внимания"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__default
 msgid "Activated by default when subscribing."
 msgstr "Активируется по умолчанию при подписке."
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__active
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_search
 msgid "Active"
 msgstr "Активно"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__active_domain
 msgid "Active domain"
 msgstr "Активный домен"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/systray.xml:87
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_ids
-#: model:ir.model.fields,field_description:mail.field_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.model.fields,field_description:mail.field_account_invoice__activity_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_ids
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
 #: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 #: model:mail.message.subtype,name:mail.mt_activities
@@ -562,7 +478,7 @@ msgstr "Деятельность"
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:60
 #: model:ir.model,name:mail.model_mail_activity
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_type_id
+#: 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
@@ -576,17 +492,43 @@ msgid "Activity Mixin"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_state
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_state
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_state
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_state
+msgid "Activity State"
+msgstr "Этап действия"
+
+#. 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 ""
+msgstr "Тип действия"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.mail_activity_type_action
 #: model:ir.ui.menu,name:mail.menu_mail_activity_type
 #: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 msgid "Activity Types"
-msgstr ""
+msgstr "Типы действий"
 
 #. module: mail
 #. openerp-web
@@ -597,7 +539,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:87
+#: code:addons/mail/static/src/xml/discuss.xml:87
 #, python-format
 msgid "Add"
 msgstr "Добавить"
@@ -605,7 +547,7 @@ msgstr "Добавить"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:64
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_channel_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__channel_ids
 #, python-format
 msgid "Add Channels"
 msgstr "Добавить каналы"
@@ -613,7 +555,7 @@ msgstr "Добавить каналы"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:61
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_partner_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
 msgid "Add Followers"
@@ -626,22 +568,28 @@ msgid "Add Followers can only be done on a mail thread model"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,field_description:mail.field_mail_template_user_signature
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,field_description:mail.field_mail_template__user_signature
 msgid "Add Signature"
 msgstr "Добавить подпись"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:41
-#: code:addons/mail/static/src/xml/client_action.xml:186
+#: code:addons/mail/static/src/xml/discuss.xml:41
+#: code:addons/mail/static/src/xml/discuss.xml:186
 #, python-format
 msgid "Add a channel"
 msgstr "Добавить канал"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:335
+#, python-format
+msgid "Add a new %(document)s or send an email to %(email_link)s"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:60
+#: code:addons/mail/static/src/xml/discuss.xml:60
 #, python-format
 msgid "Add a private channel"
 msgstr ""
@@ -658,7 +606,7 @@ msgid "Add contacts to notify..."
 msgstr "Добавить получателей..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
 msgid "Additional Contacts"
 msgstr "Дополнительные контакты"
 
@@ -673,45 +621,45 @@ msgid "Advanced Settings"
 msgstr "Расширенные настройки"
 
 #. 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_res_users_alias_id
+#: 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_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
 msgid "Alias"
 msgstr "Псевдоним"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_contact
+#: 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
+#: model:ir.model.fields,field_description:mail.field_res_users__alias_contact
 msgid "Alias Contact Security"
 msgstr "Псевдоним контакта безопасности"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__alias_domain
 msgid "Alias Domain"
 msgstr "Домен псевдонима"
 
 #. module: mail
-#: 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_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
 msgid "Alias Name"
 msgstr "Название псевдонима"
 
 #. module: mail
-#: 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_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
 msgid "Alias domain"
 msgstr "Псевдоним домена"
 
 #. module: mail
-#: 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_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
 msgid "Aliased Model"
 msgstr "Модель пвсевдонима"
 
@@ -736,16 +684,16 @@ msgstr "Всегда"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:198
+#: code:addons/mail/static/src/js/services/chat_manager.js:1328
 #, python-format
 msgid "Anonymous"
 msgstr "Анонимно"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__no_auto_thread
 msgid ""
 "Answers do not go in the original document discussion thread. This has an "
 "impact on the generated message-id."
@@ -754,8 +702,8 @@ msgstr ""
 "сгенерированный id сообщения."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_id
 msgid "Applies to"
 msgstr "Применяется к"
 
@@ -767,9 +715,14 @@ msgid "Apply"
 msgstr "Применить "
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+msgid "Archived"
+msgstr "Архивировано"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:45
-#: model:ir.model.fields,field_description:mail.field_mail_activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
 #, python-format
 msgid "Assigned to"
 msgstr "Назначено"
@@ -780,19 +733,19 @@ msgid "Attach a file"
 msgstr "Прикрепить файл"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_template__attachment_ids
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Attachments"
 msgstr "Вложения"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_message_attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_message__attachment_ids
 msgid ""
 "Attachments are linked to a document through model / res_id and to the "
 "message through this field."
@@ -811,10 +764,10 @@ msgid "Authenticated Partners"
 msgstr "Авторизованные партнёры"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_id
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Author"
 msgstr "Автор"
@@ -825,10 +778,10 @@ msgid "Author Signature (mass mail only)"
 msgstr "Подпись автора (только для массовой рассылки)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,help:mail.field_mail_mail_author_id
-#: model:ir.model.fields,help:mail.field_mail_message_author_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,help:mail.field_mail_mail__author_id
+#: model:ir.model.fields,help:mail.field_mail_message__author_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_id
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that"
 " did not match any partner."
@@ -837,27 +790,27 @@ msgstr ""
 " который не соответствует ни одному партнеру."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_avatar
 msgid "Author's avatar"
 msgstr "Аватар автора"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_public_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_public_id
 msgid "Authorized Group"
 msgstr "Авторизованная группа"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_template__auto_delete
 msgid "Auto Delete"
 msgstr "Авто удаление"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_ids
 msgid "Auto Subscription"
 msgstr "Автоматическая подписка"
 
@@ -879,16 +832,16 @@ msgid "Be careful with channels following internal notifications"
 msgstr "Осторожнее с каналами, отсдеживающими внутренние оповещения"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
-#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
 msgid "Body"
 msgstr "Содержимое"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,field_description:mail.field_res_users_message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_users__message_bounce
 msgid "Bounce"
 msgstr "Отскок"
 
@@ -934,32 +887,32 @@ msgid "Canned Response / Shortcode"
 msgstr "Готовый ответ / Сокращение"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_cc
+#: model:ir.model.fields,help:mail.field_mail_mail__email_cc
 msgid "Carbon copy message recipients"
 msgstr "Получатели скрытой копии сообщения"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,help:mail.field_mail_template_email_cc
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,help:mail.field_mail_template__email_cc
 msgid "Carbon copy recipients (placeholders may be used here)"
 msgstr "Получатели копий (здесь могут быть использованы подстановки)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,help:mail.field_mail_activity_type_category
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,help:mail.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__category
 msgid "Category"
 msgstr "Категория"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_cc
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_cc
 msgid "Cc"
 msgstr "Копия"
 
@@ -969,40 +922,40 @@ msgid "Change"
 msgstr "Изменить"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field
 msgid "Changed Field"
 msgstr "Измененное поле"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
 #: selection:mail.channel,channel_type:0
 msgid "Channel"
 msgstr "Канал"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids
+#: 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_type
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_type
 msgid "Channel Type"
 msgstr "Тип канала"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:36
-#: code:addons/mail/static/src/xml/client_action.xml:172
+#: code:addons/mail/static/src/xml/discuss.xml:36
+#: code:addons/mail/static/src/xml/discuss.xml:172
 #: code:addons/mail/static/src/xml/systray.xml:19
 #: code:addons/mail/static/src/xml/systray.xml:36
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__channel_ids
 #: model:ir.ui.menu,name:mail.mail_channel_menu_settings
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
 #, python-format
@@ -1017,7 +970,7 @@ msgstr "Каналы/Партнеры"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:168
+#: code:addons/mail/static/src/xml/discuss.xml:168
 #: code:addons/mail/static/src/xml/systray.xml:18
 #: code:addons/mail/static/src/xml/systray.xml:32
 #: model:ir.actions.client,name:mail.mail_channel_action_client_chat
@@ -1036,10 +989,10 @@ msgid "Chat Shortcode"
 msgstr "Краткие коды чата "
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__child_ids
 msgid "Child Messages"
 msgstr "Детские сообщения"
 
@@ -1049,25 +1002,6 @@ msgid "Choose an example"
 msgstr "Выберите пример"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:342
-#, python-format
-msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
-msgstr ""
-"Кликните тут, чтобы добавитьновый документ %(document)s или отправить письмо"
-" для: %(email_link)s"
-
-#. module: mail
-#: code:addons/mail/models/mail_thread.py:358
-#, python-format
-msgid "Click here to add new %s"
-msgstr "Кликните тут чтобы добавить новый %s"
-
-#. module: mail
-#: model:ir.actions.act_window,help:mail.mail_shortcode_action
-msgid "Click to define a new chat shortcode."
-msgstr "Кликните, чтобы добавить новый краткий код для чата"
-
-#. module: mail
 #: selection:mail.channel.partner,fold_state:0
 msgid "Closed"
 msgstr "Закрыт"
@@ -1083,8 +1017,8 @@ msgid "Comma-separated ids of recipient partners"
 msgstr "ID партнеров получателя, отделенные запятой"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_partner_to
-#: model:ir.model.fields,help:mail.field_mail_template_partner_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr ""
@@ -1097,8 +1031,8 @@ msgid "Comma-separated recipient addresses"
 msgstr "Адреса получателей, отделенные запятой"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,help:mail.field_mail_template_email_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,help:mail.field_mail_template__email_to
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr ""
 "Адреса получателей разделённые запятыми (здесь могут быть использованы "
@@ -1119,8 +1053,8 @@ msgid "Compose Email"
 msgstr "Написать письмо"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_composition_mode
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__composition_mode
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__composition_mode
 msgid "Composition mode"
 msgstr "Режим составления"
 
@@ -1131,14 +1065,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:109
+#: code:addons/mail/static/src/xml/thread.xml:114
 #, python-format
 msgid "Congratulations, your inbox is empty"
 msgstr "Поздравляем, ваш почтовый ящик пуст"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:647
+#: code:addons/mail/static/src/js/discuss.js:662
 #, python-format
 msgid "Congratulations, your inbox is empty!"
 msgstr ""
@@ -1155,20 +1089,20 @@ msgid "Content"
 msgstr "Содержание"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_body
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body
-#: model:ir.model.fields,field_description:mail.field_mail_message_body
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_body
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__body
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body
+#: model:ir.model.fields,field_description:mail.field_mail_message__body
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__body
 msgid "Contents"
 msgstr "Содержание"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_fold_state
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__fold_state
 msgid "Conversation Fold State"
 msgstr "Переговоры Fold State"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_minimized
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_minimized
 msgid "Conversation is minimized"
 msgstr "Разговор сведено к минимуму"
 
@@ -1180,64 +1114,70 @@ msgid "Conversations"
 msgstr "Беседы"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,help:mail.field_res_users_message_bounce
+#: model:ir.model.fields,help:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,help:mail.field_res_users__message_bounce
 msgid "Counter of the number of bounced emails for this contact"
 msgstr "Счетчик количества отклонённых писем для этого контакта"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:307
+#: code:addons/mail/static/src/js/discuss.js:318
 #, python-format
 msgid "Create %s"
 msgstr "Создать %s"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__create_date
 msgid "Create Date"
 msgstr "Дата создания"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:350
+#, python-format
+msgid "Create a new %(document)s"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Created By"
 msgstr "Создал"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_uid
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_uid
 msgid "Created by"
 msgstr "Создано"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:41
-#: 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
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_date
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_date
 #, python-format
 msgid "Created on"
 msgstr "Создан"
@@ -1248,92 +1188,24 @@ msgid "Creation Month"
 msgstr "Месяц создания  "
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,help:mail.field_mail_mail_starred
-#: model:ir.model.fields,help:mail.field_mail_message_starred
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_starred
+#: model:ir.model.fields,help:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,help:mail.field_mail_mail__starred
+#: model:ir.model.fields,help:mail.field_mail_message__starred
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__starred
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "Текущий пользователь имеет отмеченное уведомление, связанное с этим "
 "сообщением "
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_date
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__date
+#: model:ir.model.fields,field_description:mail.field_mail_message__date
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__date
 msgid "Date"
 msgstr "Дата"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,help:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,help:mail.field_event_event_message_last_post
-#: model:ir.model.fields,help:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,help:mail.field_event_track_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_track_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
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,help:mail.field_note_note_message_last_post
-#: model:ir.model.fields,help:mail.field_product_product_message_last_post
-#: model:ir.model.fields,help:mail.field_product_template_message_last_post
-#: model:ir.model.fields,help:mail.field_project_project_message_last_post
-#: model:ir.model.fields,help:mail.field_project_task_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,help:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,help:mail.field_res_users_message_last_post
-#: model:ir.model.fields,help:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,help:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr "Дата последнего сообщения"
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Deadline"
 msgstr "Срок"
@@ -1344,32 +1216,32 @@ msgid "Dear"
 msgstr "Уважаемый "
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__default
 msgid "Default"
 msgstr "По умолчанию"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,field_description:mail.field_mail_template_null_value
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,field_description:mail.field_mail_template__null_value
 msgid "Default Value"
 msgstr "Значение по умолчанию "
 
 #. module: mail
-#: 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_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
 msgid "Default Values"
 msgstr "Значения по умолчанию"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__use_default_to
 msgid "Default recipients"
 msgstr "Получатели по умолчанию "
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,help:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,help:mail.field_mail_template__use_default_to
 msgid ""
 "Default recipients of the record:\n"
 "- partner (using id on a partner or the partner_id field) OR\n"
@@ -1380,26 +1252,31 @@ msgstr ""
 "электронной почты)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.actions.act_window,help:mail.mail_shortcode_action
+msgid "Define a new chat shortcode"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete Emails"
 msgstr "Удалить письма"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete_message
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete_message
 msgid "Delete Message Copy"
 msgstr "Удалить копию сообщения"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete sent emails (mass mailing only)"
 msgstr "Удалить отправленные письма (только для массовой рассылки)"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:320
+#: code:addons/mail/static/src/xml/thread.xml:325
 #, python-format
 msgid "Delete this attachment"
 msgstr "Удалить вложение "
@@ -1410,15 +1287,15 @@ msgid "Delivery Failed"
 msgstr "Доставка не удалась"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_description
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_description
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_description
+#: model:ir.model.fields,field_description:mail.field_mail_channel__description
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__description
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__description
 #: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
 msgid "Description"
 msgstr "Описание"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_description
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__description
 msgid ""
 "Description that will be added in the message posted for this subtype. If "
 "void, the name will be added instead."
@@ -1428,7 +1305,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:46
+#: code:addons/mail/static/src/xml/discuss.xml:46
 #, python-format
 msgid "Direct Messages"
 msgstr "Прямые сообщения"
@@ -1459,26 +1336,26 @@ msgid "Discussions"
 msgstr "Обсуждения"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_activity_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_display_name
-#: 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_display_name
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__display_name
+#: 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_subtype__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_notification__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_thread__display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__display_name
 msgid "Display Name"
 msgstr "Отображаемое Имя"
 
@@ -1492,13 +1369,13 @@ msgstr ""
 "составлению с этим образцом"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_res_name
+#: 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
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete_message
 msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
@@ -1512,7 +1389,12 @@ msgid "Document Followers"
 msgstr "Подписчики документа"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_name
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_model_id
+msgid "Document Model"
+msgstr "Модель документа"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_name
 msgid "Document Name"
 msgstr ""
 
@@ -1529,32 +1411,32 @@ msgstr "Сделано"
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
 #, python-format
 msgid "Done & Schedule Next"
-msgstr ""
+msgstr "Готово & Запланировать следующее"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:296
+#: code:addons/mail/static/src/xml/thread.xml:301
 #, python-format
 msgid "Download this PDF"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:272
-#: code:addons/mail/static/src/xml/thread.xml:285
-#: code:addons/mail/static/src/xml/thread.xml:308
+#: code:addons/mail/static/src/xml/thread.xml:277
+#: code:addons/mail/static/src/xml/thread.xml:290
+#: code:addons/mail/static/src/xml/thread.xml:313
 #, python-format
 msgid "Download this attachment"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity__date_deadline
 msgid "Due Date"
 msgstr "Срок оплаты"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:37
+#: code:addons/mail/static/src/js/activity.js:94
 #, python-format
 msgid "Due in %d days"
 msgstr ""
@@ -1586,7 +1468,7 @@ msgid "Edit subscription"
 msgstr "Редактировать подписку"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_email
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_email
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 #: model:mail.activity.type,name:mail.mail_activity_data_email
 #: selection:mail.compose.message,message_type:0
@@ -1621,12 +1503,12 @@ msgid "Email Search"
 msgstr "Искать эл. почту"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_email_status
+#: model:ir.model.fields,field_description:mail.field_mail_notification__email_status
 msgid "Email Status"
 msgstr "Статусы письма"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__template_id
 msgid "Email Template"
 msgstr "Шаблон письма"
 
@@ -1646,7 +1528,7 @@ msgid "Email Thread"
 msgstr "Цепочка эл.почты"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_alias_id
+#: model:ir.model.fields,help:mail.field_res_users__alias_id
 msgid ""
 "Email address internally associated with this user. Incoming emails will "
 "appear in the user's notifications."
@@ -1655,10 +1537,10 @@ msgstr ""
 " будет показываться в уведомлениях этого пользователя."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_email_from
-#: model:ir.model.fields,help:mail.field_mail_mail_email_from
-#: model:ir.model.fields,help:mail.field_mail_message_email_from
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,help:mail.field_mail_compose_message__email_from
+#: model:ir.model.fields,help:mail.field_mail_mail__email_from
+#: model:ir.model.fields,help:mail.field_mail_message__email_from
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__email_from
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found and replaces the author_id field in the chatter."
@@ -1696,7 +1578,7 @@ msgid "Error during communication with the publisher warranty server."
 msgstr "Ошибка во время связи с сервером гарантии издателя."
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:302
+#: code:addons/mail/models/mail_mail.py:300
 #, python-format
 msgid ""
 "Error without exception. Probably due do sending an email without computed "
@@ -1739,7 +1621,7 @@ msgid "Extended Filters..."
 msgstr "Расширенные фильтры..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_fail_counter
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__fail_counter
 msgid "Fail Mail"
 msgstr "Проблемные письма"
 
@@ -1749,19 +1631,19 @@ msgid "Failed"
 msgstr "Неудачно"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:374
+#: code:addons/mail/models/mail_template.py:368
 #, python-format
 msgid "Failed to render template %r using values %r"
 msgstr "Ошибка обработки шаблона %r с использованием переменной %r"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,field_description:mail.field_mail_mail__failure_reason
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Failure Reason"
 msgstr "Причина сбоя"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
 msgid ""
 "Failure reason. This is usually the exception thrown by the email server, "
 "stored to ease the debugging of mailing issues."
@@ -1770,45 +1652,45 @@ msgstr ""
 "почты, которое хранится для облегчения отладки проблем с почтой."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred_partner_ids
 msgid "Favorited By"
 msgstr "Понравилось"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:215
-#: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
+#: code:addons/mail/static/src/js/activity.js:245
+#: model:ir.model.fields,field_description:mail.field_mail_activity__feedback
 #, python-format
 msgid "Feedback"
 msgstr "Обратная связь"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_object_field
 msgid "Field"
 msgstr "Поле"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:24
+#: code:addons/mail/models/ir_model.py:30
 #, python-format
 msgid "Field \"Mail Thread\" cannot be changed to \"False\"."
 msgstr "Поле Почтовая тема\" не может быть изменено на \"False\"."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_desc
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_desc
 msgid "Field Description"
 msgstr "Описание поля"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_type
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_type
 msgid "Field Type"
 msgstr "Тип поля"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__relation_field
 msgid ""
 "Field used to link the related model to the subtype model when using "
 "automatic subscription on a related document. The field is used to compute "
@@ -1824,8 +1706,8 @@ msgid "Fields"
 msgstr "Поля"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,help:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,help:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,help:mail.field_mail_template__copyvalue
 msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
@@ -1840,7 +1722,6 @@ msgstr "Свернутый"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:696
 #: code:addons/mail/static/src/xml/followers.xml:20
 #, python-format
 msgid "Follow"
@@ -1848,208 +1729,211 @@ msgstr "Подписаться"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_followers
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_follower_ids
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: model:ir.ui.view,arch_db:mail.view_followers_tree
 msgid "Followers"
 msgstr "Подписчики"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_channel_ids
 msgid "Followers (Channels)"
 msgstr "Подписчики (Каналы)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_partner_ids
 msgid "Followers (Partners)"
 msgstr "Подписчики (Партнеры)"
 
@@ -2078,18 +1962,18 @@ msgid "Following"
 msgstr "Подписан"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_icon
-#: model:ir.model.fields,help:mail.field_mail_activity_type_icon
+#: 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_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
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_from
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_from
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__email_from
 msgid "From"
 msgstr "От"
 
@@ -2104,7 +1988,7 @@ msgstr "Будущее"
 #: 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 "Future Activities"
-msgstr ""
+msgstr "Будущие действия"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.view_message_form
@@ -2112,7 +1996,7 @@ msgid "Gateway"
 msgstr "Шлюз"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:55
+#: code:addons/mail/models/res_users.py:54
 #, python-format
 msgid "Go to the configuration panel"
 msgstr "Перейти к панели конфигурации"
@@ -2155,49 +2039,54 @@ msgid "Has attachments"
 msgstr "Есть вложения"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_headers
+#: model:ir.model.fields,field_description:mail.field_mail_mail__headers
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Headers"
 msgstr "Заголовки"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_hidden
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Hello"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
 msgid "Hidden"
 msgstr "Скрытый"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_hidden
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__hidden
 msgid "Hide the subtype in the follower options"
 msgstr "Скрыть подтип в следующих опциях"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_id
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__id
+#: 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_subtype__id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__id
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__id
+#: model:ir.model.fields,field_description:mail.field_mail_template__id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__id
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__id
 msgid "ID"
 msgstr "Номер"
 
 #. module: mail
-#: 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_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
 msgid ""
 "ID of the parent record holding the alias (example: project holding the task"
 " creation alias)"
@@ -2206,163 +2095,165 @@ msgstr ""
 "псевдоним для создания записи)"
 
 #. 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
+#: 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 "Иконка"
 
 #. 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
+#: 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"
 msgstr "номер отслеживаемого ресурса"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:119
-#: code:addons/mail/static/src/xml/client_action.xml:203
+#: code:addons/mail/static/src/xml/discuss.xml:119
+#: code:addons/mail/static/src/xml/discuss.xml:203
 #, python-format
 msgid "Idle"
 msgstr "Холостой ход"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,help:mail.field_event_event_message_unread
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread
-#: model:ir.model.fields,help:mail.field_event_track_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,help:mail.field_note_note_message_unread
-#: model:ir.model.fields,help:mail.field_product_product_message_unread
-#: model:ir.model.fields,help:mail.field_product_template_message_unread
-#: model:ir.model.fields,help:mail.field_project_project_message_unread
-#: model:ir.model.fields,help:mail.field_project_task_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread
-#: model:ir.model.fields,help:mail.field_res_users_message_unread
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,help:mail.field_event_event__message_unread
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread
+#: model:ir.model.fields,help:mail.field_event_track__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,help:mail.field_note_note__message_unread
+#: model:ir.model.fields,help:mail.field_product_product__message_unread
+#: model:ir.model.fields,help:mail.field_product_template__message_unread
+#: model:ir.model.fields,help:mail.field_project_project__message_unread
+#: model:ir.model.fields,help:mail.field_project_task__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread
+#: model:ir.model.fields,help:mail.field_res_users__message_unread
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread
 msgid "If checked new messages require your attention."
 msgstr "Если отмечено, новые сообщения будут требовать вашего внимания."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,help:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction
 msgid "If checked, new messages require your attention."
 msgstr "Если отмечено - новые сообщения требуют Вашего внимания."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
 msgid ""
 "If checked, the partners will receive an email warning they have been added "
 "in the document's followers."
@@ -2371,8 +2262,8 @@ msgstr ""
 "как подписчики документа."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,help:mail.field_mail_template_user_signature
+#: model:ir.model.fields,help:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,help:mail.field_mail_template__user_signature
 msgid ""
 "If checked, the user's signature will be appended to the text version of the"
 " message"
@@ -2381,8 +2272,8 @@ msgstr ""
 "пользователя"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_opt_out
-#: model:ir.model.fields,help:mail.field_res_users_opt_out
+#: model:ir.model.fields,help:mail.field_res_partner__opt_out
+#: model:ir.model.fields,help:mail.field_res_users__opt_out
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails for mass "
 "mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
@@ -2394,7 +2285,7 @@ msgstr ""
 "партнеров, совершая массовую рассылку."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_mail__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible."
@@ -2403,8 +2294,8 @@ msgstr ""
 "установлено, письмо будет отправлено как можно скорее."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_scheduled_date
-#: model:ir.model.fields,help:mail.field_mail_template_scheduled_date
+#: model:ir.model.fields,help:mail.field_email_template_preview__scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_template__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible. Jinja2 placeholders may be used."
@@ -2414,7 +2305,7 @@ msgstr ""
 "использован Jinja2 вставка."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
 msgid ""
 "If you have setup a catch-all email domain redirected to the Odoo server, "
 "enter the domain name here."
@@ -2423,26 +2314,26 @@ msgstr ""
 "сервер Odoo, введите здесь имя домена."
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:141
+#: code:addons/mail/models/mail_alias.py:130
 #, python-format
 msgid "Inactive Alias"
 msgstr "Неактивный псевдоним"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:655
-#: code:addons/mail/static/src/xml/client_action.xml:22
-#: code:addons/mail/static/src/xml/client_action.xml:154
-#: code:addons/mail/static/src/xml/client_action.xml:164
+#: code:addons/mail/static/src/js/services/chat_manager.js:84
+#: code:addons/mail/static/src/xml/discuss.xml:22
+#: code:addons/mail/static/src/xml/discuss.xml:154
+#: code:addons/mail/static/src/xml/discuss.xml:164
 #, python-format
 msgid "Inbox"
 msgstr "Входящие"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,help:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,help:mail.field_mail_message_parent_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,help:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,help:mail.field_mail_message__parent_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__parent_id
 msgid "Initial thread message."
 msgstr "Первое сообщение цепочки."
 
@@ -2453,12 +2344,12 @@ msgid "Integrations"
 msgstr "Интеграции"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__internal
 msgid "Internal Only"
 msgstr "Только внутренние"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:99
+#: code:addons/mail/models/mail_alias.py:88
 #, python-format
 msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
@@ -2468,7 +2359,8 @@ msgstr ""
 " \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1794
+#: code:addons/mail/models/mail_thread.py:1811
+#: code:addons/mail/models/mail_thread.py:1996
 #, python-format
 msgid ""
 "Invalid record set: should be called as model (without records) or on "
@@ -2478,14 +2370,14 @@ msgstr ""
 "на одну запись установка записи"
 
 #. module: mail
-#: code:addons/mail/controllers/main.py:41
+#: code:addons/mail/controllers/main.py:40
 #, python-format
 msgid "Invalid token in route %s"
 msgstr "Недопустимый токен в маршруте %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "Invitation"
 msgstr "Приглашение"
@@ -2498,8 +2390,8 @@ msgstr "Приглашение к следованию %s: %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:44
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:44
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite"
 msgstr "Приглашение"
@@ -2513,15 +2405,15 @@ msgstr "Пригласить подписчика"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:31
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:29
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite people"
 msgstr "Пригласить людей"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:867
+#: code:addons/mail/static/src/js/discuss.js:882
 #, python-format
 msgid "Invite people to #%s"
 msgstr "Пригласить людей в #%s"
@@ -2537,95 +2429,96 @@ msgid "Invited people only"
 msgstr "Только приглашенные"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_note_note_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_product_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_template_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_project_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_task_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_users_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_note_note__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_product__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_template__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_project__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_task__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_users__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_is_follower
 msgid "Is Follower"
 msgstr "Подписчик"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification
+#: model:ir.model.fields,field_description:mail.field_mail_mail__notification
 msgid "Is Notification"
 msgstr "это уведомление"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_read
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_read
 msgid "Is Read"
 msgstr "Прочитано"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_subscribed
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_subscribed
 msgid "Is Subscribed"
 msgstr "Подписан"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_member
 msgid "Is a member"
 msgstr "Это член"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
 msgid "Is pinned on the interface"
 msgstr "Закреплен на интерфейсе"
 
@@ -2640,144 +2533,76 @@ msgid "Join a group"
 msgstr "Присоединиться к группе"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_lang
-#: model:ir.model.fields,field_description:mail.field_mail_template_lang
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__lang
+#: model:ir.model.fields,field_description:mail.field_mail_template__lang
 msgid "Language"
 msgstr "Язык"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_track_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_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_test_simple_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_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
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,field_description:mail.field_note_note_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_product_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_template_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_project_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_task_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_users_message_last_post
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_last_post
-msgid "Last Message Date"
-msgstr "Последнее сообщение по дате"
-
-#. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner___last_update
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message___last_update
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract___last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message____last_update
+#: 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_subtype____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_notification____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_template____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_thread____last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract____last_update
 msgid "Last Modified on"
 msgstr "Последнее изменение"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_last_seen_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_seen_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_last_seen_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__seen_message_id
 msgid "Last Seen"
 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_uid
-#: 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_tracking_value_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_uid
 msgid "Last Updated by"
 msgstr "Последний раз обновил"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_date
-#: 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_tracking_value_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_date
 msgid "Last Updated on"
 msgstr "Последнее обновление"
 
@@ -2792,7 +2617,7 @@ msgstr "Позже"
 #: 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 "Late Activities"
-msgstr ""
+msgstr "Действия с опозданием"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
@@ -2801,14 +2626,14 @@ msgstr "Отгул"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:687
-#: code:addons/mail/static/src/xml/client_action.xml:112
+#: code:addons/mail/models/mail_channel.py:693
+#: code:addons/mail/static/src/xml/discuss.xml:112
 #, python-format
 msgid "Leave this channel"
 msgstr "Удалиться из канала"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_channel_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__channel_ids
 msgid ""
 "List of channels that will be added as listeners of the current document."
 msgstr ""
@@ -2816,25 +2641,25 @@ msgstr ""
 "документа."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__partner_ids
 msgid ""
 "List of partners that will be added as follower of the current document."
 msgstr ""
 "Список партнеров, которые будут добавлены в подписчики текущего документа."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:698
+#: code:addons/mail/models/mail_channel.py:704
 #, python-format
 msgid "List users in the current channel"
 msgstr "Показать всех подписчиков канала"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__channel_id
 msgid "Listener"
 msgstr "Слушатель"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_partner_ids
 msgid "Listeners"
 msgstr "Слушатели"
 
@@ -2850,7 +2675,7 @@ msgstr "Онлайн-чат диалог"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:31
+#: code:addons/mail/static/src/js/chatter_composer.js:30
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Log"
@@ -2874,8 +2699,8 @@ 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__is_log
 msgid "Log an Internal Note"
 msgstr "Внести внутреннюю заметку"
 
@@ -2884,7 +2709,7 @@ msgstr "Внести внутреннюю заметку"
 #: code:addons/mail/static/src/xml/chatter.xml:56
 #, python-format
 msgid "Log note"
-msgstr ""
+msgstr "Добавить заметку"
 
 #. module: mail
 #. openerp-web
@@ -2894,10 +2719,10 @@ msgid "Log or schedule an activity"
 msgstr ""
 
 #. 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
+#: 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 ""
 
@@ -2907,13 +2732,13 @@ msgid "Mail Channel Form"
 msgstr "Форма почтового канала"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:369
+#: code:addons/mail/models/mail_mail.py:367
 #, python-format
 msgid "Mail Delivery Failed"
 msgstr "Ошибка Доставки Почты"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,field_description:mail.field_ir_model__is_mail_thread
 #: model:ir.ui.view,arch_db:mail.model_search_view
 msgid "Mail Thread"
 msgstr "Почтовая тема"
@@ -2924,7 +2749,7 @@ msgid "Mail Tracking Value"
 msgstr "Значение отслеживания почты"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_notification
+#: model:ir.model.fields,help:mail.field_mail_mail__notification
 msgid "Mail has been created to notify people of an existing mail.message"
 msgstr "Почта была создана для уведомления людей существующих mail.message"
 
@@ -2936,7 +2761,7 @@ msgid "Mail: Email Queue Manager"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:832
+#: code:addons/mail/models/mail_thread.py:813
 #, python-format
 msgid "Mailbox unavailable - %s"
 msgstr ""
@@ -2955,14 +2780,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all as read"
 msgstr "Отметить все как прочитанные"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all read"
 msgstr "Отметить все как прочитанные"
@@ -2974,15 +2799,15 @@ msgstr "Отметить сделанным"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:206
+#: code:addons/mail/static/src/xml/thread.xml:211
 #, python-format
 msgid "Mark as Read"
 msgstr "Пометить как прочитанное"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:153
-#: code:addons/mail/static/src/xml/thread.xml:200
+#: code:addons/mail/static/src/xml/thread.xml:158
+#: code:addons/mail/static/src/xml/thread.xml:205
 #, python-format
 msgid "Mark as Todo"
 msgstr "Маркировать как TODO"
@@ -2992,15 +2817,15 @@ msgstr "Маркировать как TODO"
 #: code:addons/mail/static/src/xml/web_kanban_activity.xml:49
 #, python-format
 msgid "Mark as done"
-msgstr ""
+msgstr "Отметить сделанным"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_medium
 msgid "Medium-sized photo"
 msgstr "Фото среднего размера"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,help:mail.field_mail_channel__image_medium
 msgid ""
 "Medium-sized photo of the group. It is automatically resized as a 128x128px "
 "image, with aspect ratio preserved. Use this field in form views or some "
@@ -3022,7 +2847,7 @@ msgid "Members"
 msgstr "Члены"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,help:mail.field_mail_channel__group_ids
 msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
@@ -3032,16 +2857,22 @@ msgstr ""
 "понадобится."
 
 #. module: mail
+#: code:addons/mail/wizard/base_partner_merge.py:13
+#, python-format
+msgid "Merged with the following partners:"
+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.model.fields,field_description:mail.field_mail_mail__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Message"
 msgstr "Сообщение"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
 msgid "Message ID"
 msgstr "ИД сообщения"
 
@@ -3051,37 +2882,37 @@ 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
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_mail__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_message__record_name
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__record_name
 msgid "Message Record Name"
 msgstr "Название записи сообщения"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__name
 msgid "Message Type"
 msgstr "Тип сообщения"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_to
+#: model:ir.model.fields,help:mail.field_mail_mail__email_to
 msgid "Message recipients (emails)"
 msgstr "Получатели сообщений (е-почта)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_references
+#: model:ir.model.fields,help:mail.field_mail_mail__references
 msgid "Message references, such as identifiers of previous messages"
 msgstr "Ссылки сообщения, такие как идентификаторы предыдущих сообщений"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
+#: code:addons/mail/static/src/xml/discuss.xml:124
 #, python-format
 msgid "Message sent in \""
 msgstr "Сообщение отправленное в \""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__name
 msgid ""
 "Message subtype gives a more precise type on the message, especially for "
 "system notifications. For example, it can be a notification related to a new"
@@ -3101,17 +2932,17 @@ msgid "Message subtypes"
 msgstr "Подтип сообщения"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_followers_subtype_ids
+#: model:ir.model.fields,help:mail.field_mail_followers__subtype_ids
 msgid ""
 "Message subtypes followed, meaning subtypes that will be pushed onto the "
 "user's Wall."
 msgstr "Подтипы сообщений, на которые имеется подписка."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,help:mail.field_mail_mail_message_type
-#: model:ir.model.fields,help:mail.field_mail_message_message_type
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,help:mail.field_mail_mail__message_type
+#: model:ir.model.fields,help:mail.field_mail_message__message_type
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_type
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
@@ -3121,87 +2952,88 @@ msgstr ""
 "пользователя"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,help:mail.field_mail_mail_message_id
-#: model:ir.model.fields,help:mail.field_mail_message_message_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,help:mail.field_mail_mail__message_id
+#: model:ir.model.fields,help:mail.field_mail_message__message_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_id
 msgid "Message unique identifier"
 msgstr "Уникальный идентификатор сообщения"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_id
 msgid "Message-Id"
 msgstr "ID сообщения"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_ids
 #: model:ir.ui.menu,name:mail.menu_mail_message
 #: model:ir.ui.view,arch_db:mail.view_message_tree
 msgid "Messages"
@@ -3222,7 +3054,7 @@ msgstr ""
 "позже."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__internal
 msgid ""
 "Messages with internal subtypes will be visible only by employees, aka "
 "members of base_user group"
@@ -3231,20 +3063,20 @@ msgstr ""
 " base_user"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_res_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_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
 msgid "Model"
 msgstr "Модель"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_res_model
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__res_model
 msgid "Model of the followed resource"
 msgstr "Модель обсуждаемого ресурса"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__res_model
 msgid ""
 "Model the subtype applies to. If False, this subtype applies to all models."
 msgstr ""
@@ -3259,7 +3091,7 @@ msgstr "Модели"
 #. module: mail
 #: model:ir.model,name:mail.model_base_module_uninstall
 msgid "Module Uninstallation"
-msgstr ""
+msgstr "Деинсталляция модуля"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_search
@@ -3270,28 +3102,28 @@ msgstr "Месяц"
 #: 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 ""
+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_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.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Name"
 msgstr "Название"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_record_name
-#: model:ir.model.fields,help:mail.field_mail_mail_record_name
-#: model:ir.model.fields,help:mail.field_mail_message_record_name
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,help:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,help:mail.field_mail_mail__record_name
+#: model:ir.model.fields,help:mail.field_mail_message__record_name
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__record_name
 msgid "Name get of the related document."
 msgstr "Название связанного документа."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,help:mail.field_mail_template_report_name
+#: model:ir.model.fields,help:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,help:mail.field_mail_template__report_name
 msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
@@ -3300,71 +3132,71 @@ msgstr ""
 "Расширение может быть опущено и будет взято из типа отчёта."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_mail_needaction
-#: model:ir.model.fields,help:mail.field_mail_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_mail__needaction
+#: model:ir.model.fields,help:mail.field_mail_message__needaction
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__needaction
 #: model:ir.ui.view,arch_db:mail.view_message_search
 msgid "Need Action"
 msgstr "Требует действия"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_res_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
 msgid "Needaction Recipient"
 msgstr "Требуется действие получателя"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:138
+#: code:addons/mail/static/src/xml/discuss.xml:138
 #, python-format
 msgid "New Channel"
-msgstr ""
+msgstr "Новый канал"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:137
+#: code:addons/mail/static/src/xml/discuss.xml:137
 #, python-format
 msgid "New Message"
-msgstr ""
+msgstr "Новое сообщение"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_char
 msgid "New Value Char"
 msgstr "Новое значение строка"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_datetime
 msgid "New Value Datetime"
 msgstr "Новое значение (дата/время)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_float
 msgid "New Value Float"
 msgstr "Новое значение (float)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_integer
 msgid "New Value Integer"
 msgstr "Новое значение (целое)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_monetary
 msgid "New Value Monetary"
 msgstr "Новое значение (денежное)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_text
 msgid "New Value Text"
 msgstr "Новое значение (текст)"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:55
-#: code:addons/mail/static/src/js/window_manager.js:139
+#: code:addons/mail/static/src/js/services/chat_manager.js:1625
+#: code:addons/mail/static/src/js/services/chat_window_manager.js:283
 #: code:addons/mail/static/src/xml/systray.xml:12
 #: code:addons/mail/static/src/xml/systray.xml:21
 #, python-format
@@ -3373,21 +3205,21 @@ msgstr "Новое сообщение"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:233
+#: code:addons/mail/static/src/xml/thread.xml:238
 #, python-format
 msgid "New messages"
 msgstr "Новые сообщения"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:110
+#: code:addons/mail/static/src/xml/thread.xml:115
 #, python-format
 msgid "New messages appear here."
 msgstr "Новые сообщения появляются здесь."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:97
+#: code:addons/mail/static/src/js/discuss.js:99
 #, python-format
 msgid "New people"
 msgstr "Новый человек"
@@ -3398,85 +3230,85 @@ msgid "Next Activities"
 msgstr "Следующие мероприятия"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_date_deadline
 msgid "Next Activity Deadline"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_summary
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_summary
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_summary
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_summary
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_summary
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_summary
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_summary
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_summary
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_summary
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_summary
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_summary
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_summary
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_summary
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_summary
 msgid "Next Activity Summary"
 msgstr "Резюме следующего мероприятия"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_type_id
 msgid "Next Activity Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,field_description:mail.field_mail_activity__has_recommended_activities
 msgid "Next activities available"
 msgstr ""
 
@@ -3520,28 +3352,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:113
+#: code:addons/mail/static/src/xml/thread.xml:118
 #, python-format
 msgid "No starred message"
 msgstr "Нет помеченных сообщений"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__no_auto_thread
 msgid "No threading for answers"
 msgstr "Никакой обработки для ответов"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_note
+#: model:ir.model.fields,field_description:mail.field_mail_activity__note
 #: model:mail.message.subtype,name:mail.mt_note
 msgid "Note"
 msgstr "Заметка"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:157
+#: code:addons/mail/static/src/xml/thread.xml:162
 #, python-format
 msgid "Note by"
 msgstr "Примечание"
@@ -3552,249 +3384,254 @@ msgid "Notification"
 msgstr "Уведомление"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_users_notification_type
+#: model:ir.model.fields,field_description:mail.field_res_users__notification_type
 msgid "Notification Management"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_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 "Уведомления"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers"
 msgstr "Уведомить подписчиков"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_notify
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_notify
+#: model:ir.model.fields,help:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers of the document (mass post only)"
 msgstr "Уведомить подписчиков документа (только массовая рассылка)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of Actions"
 msgstr "Количество действий"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_days
+#: 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_payment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of messages which requires an action"
 msgstr "Количество сообщений, требующих внимания"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread_counter
 msgid "Number of unread messages"
 msgstr "Количество непрочитанных сообщений"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model:ir.ui.view,arch_db:mail.message_notification_email
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Odoo"
 msgstr "Odoo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:895
+#: code:addons/mail/static/src/js/discuss.js:910
 #, python-format
 msgid ""
 "Odoo has now the permission to send you native notifications on this device."
@@ -3804,14 +3641,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "Odoo needs your permission to"
 msgstr "Odoo, требуется ваше разрешение для"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:892
+#: code:addons/mail/static/src/js/discuss.js:907
 #, python-format
 msgid ""
 "Odoo will not have the permission to send native notifications on this "
@@ -3822,38 +3659,38 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:120
+#: code:addons/mail/static/src/xml/discuss.xml:120
 #, python-format
 msgid "Offline"
 msgstr "Офлайн"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_char
 msgid "Old Value Char"
 msgstr "Прежнее значение (строка)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_datetime
 msgid "Old Value DateTime"
 msgstr "Прежнее значение (дата/время)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_float
 msgid "Old Value Float"
 msgstr "Прежнее значение (float)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_integer
 msgid "Old Value Integer"
 msgstr "Прежнее значение (целое)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_monetary
 msgid "Old Value Monetary"
 msgstr "Прежнее значение (денежное)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_text
 msgid "Old Value Text"
 msgstr "Прежнее значение (текст)"
 
@@ -3882,14 +3719,14 @@ msgstr "1 подписчик"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:118
-#: code:addons/mail/static/src/xml/client_action.xml:202
+#: code:addons/mail/static/src/xml/discuss.xml:118
+#: code:addons/mail/static/src/xml/discuss.xml:202
 #, python-format
 msgid "Online"
 msgstr "Онлайн"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:22
+#: code:addons/mail/models/ir_model.py:28
 #, python-format
 msgid "Only custom models can be modified."
 msgstr "Только пользовательские модели могут быть изменены."
@@ -3911,14 +3748,14 @@ msgstr "Открыть документ-предок"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Open channel settings"
 msgstr "Открыть настройки канала"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:187
+#: code:addons/mail/static/src/xml/discuss.xml:187
 #, python-format
 msgid "Open chat"
 msgstr "Открыть чат"
@@ -3931,15 +3768,15 @@ 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
+#: 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"
 msgstr "Уклониться"
 
 #. module: mail
-#: 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_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
 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 "
@@ -3950,8 +3787,8 @@ msgstr ""
 "отключит создание новых записей полностью."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,help:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,help:mail.field_mail_template__mail_server_id
 msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
@@ -3960,14 +3797,14 @@ msgstr ""
 "будет использован имеющий высший приоритет."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_template
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_template
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_template
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_template
 msgid "Optional report to print and attach"
 msgstr "Необязательный отчёт для печати и прикрепления"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_lang
-#: model:ir.model.fields,help:mail.field_mail_template_lang
+#: model:ir.model.fields,help:mail.field_email_template_preview__lang
+#: model:ir.model.fields,help:mail.field_mail_template__lang
 msgid ""
 "Optional translation language (ISO code) to select when sending out an "
 "email. If not set, the english version will be used. This should usually be "
@@ -3981,8 +3818,8 @@ msgstr ""
 "${object.partner_id.lang}."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,help:mail.field_mail_template_null_value
+#: model:ir.model.fields,help:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,help:mail.field_mail_template__null_value
 msgid "Optional value to use if the target field is empty"
 msgstr "Необязательное значение используемое если целевое поле пусто"
 
@@ -3997,8 +3834,8 @@ msgid "Outgoing"
 msgstr "Исходящие"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__mail_server_id
 msgid "Outgoing Mail Server"
 msgstr "Сервера отправки почты"
 
@@ -4008,10 +3845,10 @@ msgid "Outgoing Mails"
 msgstr "Исходящие письма"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_server_id
 msgid "Outgoing mail server"
 msgstr "Сервер исходящей почты"
 
@@ -4025,12 +3862,12 @@ msgstr "Сервер исходящей почты"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4044,43 +3881,43 @@ msgid "Override author's email"
 msgstr "Блокировать электронную почту автора"
 
 #. module: mail
-#: 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_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
 msgid "Owner"
 msgstr "Владелец"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__parent_id
 msgid "Parent"
 msgstr "Родитель"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__parent_id
 msgid "Parent Message"
 msgstr "Родительское сообщение"
 
 #. module: mail
-#: 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_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
 msgid "Parent Model"
 msgstr "Родительская модель"
 
 #. module: mail
-#: 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_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
 msgid "Parent Record Thread ID"
 msgstr "ID родительской цепочки записей"
 
 #. module: mail
-#: 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_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
 msgid ""
 "Parent model holding the alias. The model holding the alias reference is not"
 " necessarily the model given by alias_model_id (example: project "
@@ -4091,7 +3928,7 @@ msgstr ""
 "задача (model))"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__parent_id
 msgid ""
 "Parent subtype, used for automatic subscription. This field is not correctly"
 " named. For example on a project, the parent_id of project subtypes refers "
@@ -4119,42 +3956,42 @@ msgstr ""
 "Партнеры, которые не просили не включать их в кампании массовой рассылки"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction_partner_ids
 msgid "Partners with Need Action"
 msgstr "Партнеры, требующие вниманя"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_template__auto_delete
 msgid "Permanently delete this email after sending it, to save space"
 msgstr "Навсегда удалить это письмо после отправки, для экономии места"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:891
+#: code:addons/mail/static/src/js/discuss.js:906
 #, python-format
 msgid "Permission denied"
 msgstr "Доступ запрещен"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:894
+#: code:addons/mail/static/src/js/discuss.js:909
 #, python-format
 msgid "Permission granted"
 msgstr "Доступ получен"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image
 msgid "Photo"
 msgstr "Фото"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,field_description:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,field_description:mail.field_mail_template__copyvalue
 msgid "Placeholder Expression"
 msgstr "выражение подстановки"
 
@@ -4168,12 +4005,12 @@ msgstr "выражение подстановки"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4189,46 +4026,56 @@ msgid "Planned activities"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__days
+msgid "Planned in"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:282
+#: code:addons/mail/static/src/xml/thread.xml:287
 #, python-format
 msgid "Play this video"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:158
+#: code:addons/mail/static/src/js/chatter_composer.js:157
 #, python-format
 msgid "Please complete customer's informations"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:84
+#: code:addons/mail/static/src/js/many2many_tags_email.js:96
 #, python-format
 msgid "Please complete customer's informations and email"
 msgstr ""
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Please contact us instead using"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Please, wait while the file is uploading."
 msgstr "Пожалуйста, подождите , пока файл загружается."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_notification_type
+#: model:ir.model.fields,help:mail.field_res_users__notification_type
 msgid ""
 "Policy on how to handle Chatter notifications:\n"
-"- Emails: notifications are sent to your email\n"
-"- Odoo: notifications appear in your Odoo Inbox"
+"- Handle by Emails: notifications are sent to your email address\n"
+"- Handle in Odoo: notifications appear in your Odoo Inbox"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_alias_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_channel_alias_contact
-#: model:ir.model.fields,help:mail.field_res_users_alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_channel__alias_contact
+#: model:ir.model.fields,help:mail.field_res_users__alias_contact
 msgid ""
 "Policy to post a message on the document using the mailgateway.\n"
 "- everyone: everyone can post\n"
@@ -4241,12 +4088,13 @@ msgstr ""
 "— подписчики: только подписчики соответствующего документа\n"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Powered by"
 msgstr "На базе"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_previous_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__previous_type_ids
 msgid "Preceding Activities"
 msgstr "Предыдущие мероприятия"
 
@@ -4256,8 +4104,8 @@ msgid "Preferred reply address"
 msgstr "Предпочтительный адрес ответа"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,help:mail.field_mail_template_reply_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,help:mail.field_mail_template__reply_to
 msgid "Preferred response address (placeholders may be used here)"
 msgstr ""
 "Предпочтительный обратный адрес (здесь могут быть использованы подстановки)"
@@ -4273,27 +4121,27 @@ msgid "Preview of"
 msgstr "Просмотр"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_previous_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__previous_activity_type_id
 msgid "Previous Activity Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_public
+#: model:ir.model.fields,field_description:mail.field_mail_channel__public
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Privacy"
 msgstr "Конфиденциальность"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:56
-#: code:addons/mail/static/src/xml/client_action.xml:176
+#: code:addons/mail/static/src/xml/discuss.xml:56
+#: code:addons/mail/static/src/xml/discuss.xml:176
 #, python-format
 msgid "Private Channels"
 msgstr "Частные каналы"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:848
+#: code:addons/mail/static/src/js/discuss.js:863
 #, python-format
 msgid "Public Channels"
 msgstr "Публичные каналы"
@@ -4322,68 +4170,72 @@ msgid "Received"
 msgstr "Получено"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_id
 msgid "Recipient"
 msgstr "Получатель"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Recipients"
 msgstr "Получатели"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_recommended_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__recommended_activity_type_id
 msgid "Recommended Activity Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_next_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__next_type_ids
 msgid "Recommended Next Activities"
 msgstr "Рекомендованные следующие мероприятия"
 
 #. module: mail
-#: 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_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
 msgid "Record Thread ID"
 msgstr "ID цепочки записей"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_references
+#: model:ir.model.fields,field_description:mail.field_mail_mail__references
 msgid "References"
 msgstr "Ссылки"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_res_id
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Regards,"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__res_id
 msgid "Related Document ID"
 msgstr "ID связанного документа"
 
 #. 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_mail_model
-#: model:ir.model.fields,field_description:mail.field_mail_message_model
-#: model:ir.model.fields,field_description:mail.field_mail_template_model
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_model
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_model
+#: 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_compose_message__model
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_model
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__model
 msgid "Related Document Model"
 msgstr "Модель связанного документа"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_model
 msgid "Related Document Model Name"
 msgstr ""
 
@@ -4393,12 +4245,12 @@ msgid "Related Message"
 msgstr "Связанное сообщение"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__partner_id
 msgid "Related Partner"
 msgstr "Связанный партнер"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__relation_field
 msgid "Relation field"
 msgstr "Относящееся поле"
 
@@ -4418,17 +4270,17 @@ msgstr "Удалить подписчика"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:203
+#: code:addons/mail/static/src/xml/thread.xml:208
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Reply"
 msgstr "Ответить"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,help:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,help:mail.field_mail_message_reply_to
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,help:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,help:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,help:mail.field_mail_message__reply_to
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__reply_to
 msgid ""
 "Reply email address. Setting the reply_to bypasses the automatic thread "
 "creation."
@@ -4437,45 +4289,45 @@ msgstr ""
 "автоматическое создание цепочки."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_reply_to
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__reply_to
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__reply_to
 msgid "Reply-To"
 msgstr "Адрес ответа"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_name
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_name
 msgid "Report Filename"
 msgstr "Файл отчета"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_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"
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_user_id
+msgid "Responsible User"
 msgstr "Ответственный"
 
 #. module: mail
@@ -4485,12 +4337,12 @@ msgid "Retry"
 msgstr "Повтор"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body_html
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body_html
 msgid "Rich-text Contents"
 msgstr "Форматированное содержимое"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_body_html
+#: model:ir.model.fields,help:mail.field_mail_mail__body_html
 msgid "Rich-text/HTML message"
 msgstr "Текст с форматированием/HTML сообщение"
 
@@ -4500,7 +4352,7 @@ msgid "SMTP Server"
 msgstr "SMTP Сервер"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_res_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__res_id
 msgid "Sample Document"
 msgstr "Пример документа"
 
@@ -4531,29 +4383,29 @@ msgstr "График"
 #: code:addons/mail/static/src/xml/chatter.xml:60
 #, python-format
 msgid "Schedule activity"
-msgstr ""
+msgstr "Планирование"
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:250
+#: code:addons/mail/models/mail_activity.py:260
 #, python-format
 msgid "Schedule an Activity"
 msgstr "Запланировать мероприятие"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:57
 #, 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
+#: 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"
 msgstr "Запланированная дата"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__scheduled_date
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Scheduled Send Date"
 msgstr "Расписание даты отправки"
@@ -4569,8 +4421,8 @@ msgid "Search Groups"
 msgstr "Поиск групп"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__model_object_field
 msgid ""
 "Select target field from the related document model.\n"
 "If it is a relationship field you will be able to select a target field at the destination of the relationship."
@@ -4585,19 +4437,19 @@ msgstr "Выбрана группа пользователей"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:374
+#: code:addons/mail/static/src/js/composer.js:428
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Send"
 msgstr "Отправить"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail
 msgid "Send Email"
 msgstr "Отправить эл. письмо"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:264
+#: code:addons/mail/models/mail_template.py:295
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Отправить почту (%s)"
@@ -4620,16 +4472,16 @@ msgstr "Отправить сообщение"
 #: code:addons/mail/static/src/xml/chatter.xml:53
 #, python-format
 msgid "Send message"
-msgstr ""
+msgstr "Отправить сообщение"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
+#: 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_mail_template_email_from
+#: model:ir.model.fields,help:mail.field_email_template_preview__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 "
 "value will be the author's email alias if configured, or email address."
@@ -4640,14 +4492,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Sending Error"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:108
+#: code:addons/mail/static/src/xml/discuss.xml:108
 #, python-format
 msgid "Sends messages by email"
 msgstr "Отправляет сообщения по электронной почте"
@@ -4659,25 +4511,30 @@ msgid "Sent"
 msgstr "Отправлено"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_email
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "Sent by"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__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
+#: 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 "Нумерация"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Settings"
 msgstr "Настройки"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__shortcode_type
 msgid "Shortcode Type"
 msgstr ""
 
@@ -4688,7 +4545,7 @@ msgid "Shortcodes"
 msgstr "Краткие коды"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__source
 msgid "Shortcut"
 msgstr "Сокращение"
 
@@ -4699,20 +4556,20 @@ msgid "Show all records which has next action date is before today"
 msgstr "Показать все записи с просроченой датой следующего действия"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:667
+#: code:addons/mail/models/mail_channel.py:673
 #, python-format
 msgid "Show an helper message"
 msgstr "Показать краткую справку"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,field_description:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_mail_template__ref_ir_act_window
 msgid "Sidebar action"
 msgstr "Действие боковой панели"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,help:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_mail_template__ref_ir_act_window
 msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
@@ -4721,10 +4578,10 @@ msgstr ""
 " моделью документа"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_avatar
 msgid ""
 "Small-sized image of this contact. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4735,12 +4592,12 @@ msgstr ""
 "маленькое изображение."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_small
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_small
 msgid "Small-sized photo"
 msgstr "Маленькое фото"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_small
+#: model:ir.model.fields,help:mail.field_mail_channel__image_small
 msgid ""
 "Small-sized photo of the group. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4756,7 +4613,7 @@ msgid "Smiley"
 msgstr "Смайл"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_res_model_id
+#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_id
 msgid ""
 "Specify a model if the activity should be specific to a model and not "
 "available when managing activities for other models."
@@ -4764,74 +4621,52 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:661
-#: code:addons/mail/static/src/xml/client_action.xml:28
-#: code:addons/mail/static/src/xml/client_action.xml:156
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred
+#: code:addons/mail/static/src/js/services/chat_manager.js:89
+#: code:addons/mail/static/src/xml/discuss.xml:28
+#: code:addons/mail/static/src/xml/discuss.xml:156
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred
 #, python-format
 msgid "Starred"
 msgstr "Отмеченные"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_state
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_state
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_mail_activity__state
 msgid "State"
 msgstr "Регион"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_state
+#: 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
 msgid "Status"
 msgstr "Статус"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,help:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,help:mail.field_event_track_activity_state
-#: model:ir.model.fields,help:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,help:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,help:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,help:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,help:mail.field_product_template_activity_state
-#: model:ir.model.fields,help:mail.field_project_task_activity_state
-#: model:ir.model.fields,help:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,help:mail.field_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
+#: model:ir.model.fields,help:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,help:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,help:mail.field_event_track__activity_state
+#: model:ir.model.fields,help:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,help:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,help:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,help:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,help:mail.field_note_note__activity_state
+#: model:ir.model.fields,help:mail.field_product_product__activity_state
+#: model:ir.model.fields,help:mail.field_product_template__activity_state
+#: model:ir.model.fields,help:mail.field_project_task__activity_state
+#: model:ir.model.fields,help:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,help:mail.field_repair_order__activity_state
+#: model:ir.model.fields,help:mail.field_res_partner__activity_state
+#: model:ir.model.fields,help:mail.field_res_users__activity_state
+#: model:ir.model.fields,help:mail.field_sale_order__activity_state
+#: model:ir.model.fields,help:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,help:mail.field_survey_survey__activity_state
 msgid ""
 "Status based on activities\n"
 "Overdue: Due date is already passed\n"
@@ -4840,33 +4675,33 @@ msgid ""
 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
+#: 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"
 msgstr "Субполе"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,field_description:mail.field_mail_template_sub_object
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,field_description:mail.field_mail_template__sub_object
 msgid "Sub-model"
 msgstr "Субмодель"
 
 #. module: mail
 #. 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_mail_compose_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_mail_subject
-#: model:ir.model.fields,field_description:mail.field_mail_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_template_subject
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subject
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__subject
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_mail__subject
+#: model:ir.model.fields,field_description:mail.field_mail_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_template__subject
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subject
 #, python-format
 msgid "Subject"
 msgstr "Тема"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_subject
-#: model:ir.model.fields,help:mail.field_mail_template_subject
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr "Тема (здесь могут быть использованы подстановки)"
@@ -4878,22 +4713,22 @@ msgstr "Тема"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:216
+#: code:addons/mail/static/src/xml/thread.xml:221
 #, python-format
 msgid "Subject:"
 msgstr "Тема:"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_substitution
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__substitution
 msgid "Substitution"
 msgstr "Замена"
 
 #. module: mail
-#: 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_1993
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subtype_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subtype_id
 #: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
 msgid "Subtype"
 msgstr "Подтип"
@@ -4905,8 +4740,8 @@ msgid "Subtypes"
 msgstr "Подтипы"
 
 #. 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
+#: 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 "Описание"
 
@@ -4918,7 +4753,7 @@ msgid "System notification"
 msgstr "Системное уведомление"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,help:mail.field_mail_activity__has_recommended_activities
 msgid "Technical field for UX purpose"
 msgstr ""
 
@@ -4928,6 +4763,14 @@ msgid "Template Preview"
 msgstr "Просмотр шаблона"
 
 #. module: mail
+#: code:addons/mail/models/mail_template.py:264
+#, python-format
+msgid ""
+"Template rendering failed, this could mean that your template contains "
+"python syntax errors"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_template_tree_all
 #: model:ir.ui.menu,name:mail.menu_email_templates
 #: model:ir.ui.view,arch_db:mail.email_template_form
@@ -4937,14 +4780,24 @@ msgid "Templates"
 msgstr "Шаблоны"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The"
+msgstr "Это"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The email sent to"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_shortcode__substitution
 msgid "The escaped html code replacing the shortcut"
 msgstr "Скрытый html-код, заменяющий ярлык"
 
 #. module: mail
-#: 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_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
 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 "
@@ -4955,9 +4808,9 @@ msgstr ""
 " создание новой записи этой модели (например, задача в проекте)"
 
 #. module: mail
-#: 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_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
 msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
@@ -4966,9 +4819,9 @@ msgstr ""
 "получать почту для <jobs@example.odoo.com>"
 
 #. module: mail
-#: 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_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
 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 "
@@ -4980,9 +4833,9 @@ msgstr ""
 " или сделает владельцем администратора."
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:165
-#: code:addons/mail/models/mail_message.py:579
-#: code:addons/mail/models/mail_message.py:674
+#: code:addons/mail/models/mail_activity.py:175
+#: code:addons/mail/models/mail_message.py:578
+#: code:addons/mail/models/mail_message.py:678
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -4994,18 +4847,18 @@ msgstr ""
 "(Тип документа :%s, операция: %s)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__source
 msgid "The shortcut which must be replaced in the Chat Messages"
 msgstr "Ярлык, который необходимо заменить в сообщениях чата"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__unicode_source
 msgid "The source is replaced by this unicode character in the Chat Messages"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,help:mail.field_mail_template_model_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,help:mail.field_mail_template__model_id
 msgid "The type of document this template can be used with"
 msgstr "Тип документа, с которым этот шаблон может быть использован"
 
@@ -5015,7 +4868,7 @@ msgid "This"
 msgstr "Это"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image
+#: model:ir.model.fields,help:mail.field_mail_channel__image
 msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
@@ -5024,7 +4877,7 @@ msgstr ""
 "группы, ограничен 1024x1024px ."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_public
+#: model:ir.model.fields,help:mail.field_mail_channel__public
 msgid ""
 "This group is visible by non members. Invisible groups can add members "
 "through the invite button."
@@ -5038,20 +4891,20 @@ msgid "Thread"
 msgstr "Цепочка"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_to
 msgid "To"
 msgstr "До"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_to
 msgid "To (Emails)"
 msgstr "Кому (Адреса электронной почты)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_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
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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)"
 msgstr "Кому (Партнеры)"
 
@@ -5066,8 +4919,8 @@ msgstr "Кому:"
 #. module: mail
 #. openerp-web
 #: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:25
-#: code:addons/mail/static/src/js/thread.js:242
+#: code:addons/mail/static/src/js/activity.js:82
+#: code:addons/mail/static/src/js/thread.js:328
 #: code:addons/mail/static/src/xml/systray.xml:75
 #: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
 #: selection:hr.applicant,activity_state:0
@@ -5077,12 +4930,12 @@ msgstr "Кому:"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -5104,7 +4957,7 @@ msgstr "Сделать"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:35
+#: code:addons/mail/static/src/js/activity.js:92
 #, python-format
 msgid "Tomorrow"
 msgstr "Завтра"
@@ -5115,10 +4968,10 @@ msgid "Topics discussed in this group..."
 msgstr "Темы, обсуждаемые в этой группе"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid ""
 "Tracked values are stored in a separate model. This field allow to "
 "reconstruct the tracking and to generate statistics on the model."
@@ -5127,7 +4980,7 @@ msgstr ""
 "реконструировать отслеживания и создавать данные статистики модели."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,field_description:mail.field_ir_model_fields__track_visibility
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Tracking"
 msgstr "Отслеживание"
@@ -5145,28 +4998,28 @@ msgid "Tracking Values"
 msgstr "История изменений"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid "Tracking values"
 msgstr "История изменений"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_type
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_type
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_type
 msgid "Type"
 msgstr "Тип"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_uuid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__uuid
 msgid "UUID"
 msgstr "UUID"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:235
+#: code:addons/mail/models/mail_mail.py:233
 #, python-format
 msgid "Unable to connect to SMTP Server"
 msgstr ""
@@ -5181,7 +5034,6 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:700
 #: code:addons/mail/static/src/xml/followers.xml:22
 #, python-format
 msgid "Unfollow"
@@ -5196,143 +5048,145 @@ msgstr ""
 "уникальный"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__unicode_source
 msgid "Unicode Character"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread
 msgid "Unread Messages"
 msgstr "Непрочитанные Сообщения"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread_counter
 msgid "Unread Messages Counter"
 msgstr "Счетчик непрочитанных сообщений"
 
@@ -5343,61 +5197,61 @@ msgstr "Непрочитанные сообщения"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all"
 msgstr "Отзвездить все"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all messages"
 msgstr "Отзвездить все сообщения"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe from channel"
 msgstr "Отписаться от канала"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:510
+#: code:addons/mail/models/mail_template.py:504
 #, python-format
 msgid "Unsupported report type %s found."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:322
+#: code:addons/mail/static/src/xml/thread.xml:327
 #, python-format
 msgid "Uploading"
 msgstr "Загрузка"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Uploading error"
 msgstr "Ошибка выгрузки"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_use_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_use_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__use_active_domain
 msgid "Use active domain"
 msgstr "Использовать активный домен"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_template_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_template_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__template_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__template_id
 msgid "Use template"
 msgstr "Использовать шаблон"
 
@@ -5407,7 +5261,7 @@ msgid "Use your own email servers"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_sequence
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__sequence
 msgid "Used to order subtypes."
 msgstr "Используется для заказа подтипов."
 
@@ -5420,7 +5274,7 @@ msgstr "Пользователь"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:51
+#: code:addons/mail/static/src/xml/discuss.xml:51
 #: code:addons/mail/static/src/xml/extended_chat_window.xml:8
 #, python-format
 msgid "User name"
@@ -5432,7 +5286,7 @@ msgid "Users"
 msgstr "Пользователи"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:711
+#: code:addons/mail/models/mail_channel.py:717
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Пользователи в этом канале: %s %s и вы."
@@ -5446,14 +5300,14 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:670
+#: code:addons/mail/models/mail_thread.py:696
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 #, python-format
 msgid "View"
 msgstr "Вид"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:668
+#: code:addons/mail/models/mail_thread.py:694
 #, python-format
 msgid "View %s"
 msgstr ""
@@ -5472,8 +5326,8 @@ msgstr ""
 "  Вы действительно хотите удалить этого подписчика?"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_sub_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__sub_model_object_field
 msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
@@ -5482,8 +5336,8 @@ msgstr ""
 "поля в пределах модели целевого документа (под-модели)."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,help:mail.field_mail_template_sub_object
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,help:mail.field_mail_template__sub_object
 msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
@@ -5492,7 +5346,7 @@ msgstr ""
 "связанную модель документа ."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,help:mail.field_ir_model_fields__track_visibility
 msgid ""
 "When set, every modification to this field will be tracked in the chatter."
 msgstr ""
@@ -5500,14 +5354,14 @@ msgstr ""
 "chatter."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_is_log
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_is_log
+#: model:ir.model.fields,help:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__is_log
 msgid "Whether the message is an internal note (comment mode only)"
 msgstr ""
 "Если сообщения является внутренней заметкой (только в режиме комментариев)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,help:mail.field_ir_model__is_mail_thread
 msgid "Whether this model supports messages and notifications."
 msgstr "Поддерживает ли эта модель сообщения и уведомления."
 
@@ -5525,47 +5379,47 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:12
+#: code:addons/mail/static/src/xml/composer.xml:11
 #, python-format
-msgid "Write something..."
-msgstr "Напишите что-нибудь..."
+msgid "Write Something..."
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:29
-#: code:addons/mail/static/src/js/thread.js:244
+#: code:addons/mail/static/src/js/activity.js:86
+#: code:addons/mail/static/src/js/thread.js:330
 #, python-format
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:96
+#: code:addons/mail/static/src/js/discuss.js:98
 #, python-format
 msgid "You added <b>%s</b> to the conversation."
 msgstr "Вы добавили <b>%s</b> в обсуждение."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:708
+#: code:addons/mail/models/mail_channel.py:714
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Вы единственный человек в этом канале"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:677
+#: code:addons/mail/models/mail_channel.py:683
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "У вас приватная беседа с <b>@%s</b>."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:672
+#: code:addons/mail/models/mail_channel.py:678
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Вы находитесь в канале <b>#%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:114
+#: code:addons/mail/static/src/xml/thread.xml:119
 #, python-format
 msgid ""
 "You can mark any message as 'starred', and it shows up in this channel."
@@ -5574,7 +5428,7 @@ msgstr ""
 "канал."
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:54
+#: code:addons/mail/models/res_users.py:53
 #, python-format
 msgid ""
 "You cannot create a new user from here.\n"
@@ -5594,14 +5448,11 @@ msgstr ""
 "множеству модулей."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:349
+#: code:addons/mail/models/mail_thread.py:342
 #, python-format
 msgid ""
-"You could also add a new %(document)s by sending an email to: "
-"%(email_link)s."
+"You could also add a new %(document)s by sending an email to %(email_link)s"
 msgstr ""
-"Вы также можете добавить новый %(document)s отправив письмо в: "
-"%(email_link)s."
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
@@ -5610,14 +5461,14 @@ msgstr "Вы были назначены для"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "You have been invited to: "
 msgstr "Вы приглашены в:"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,help:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_template__attachment_ids
 msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
@@ -5627,28 +5478,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:473
+#: code:addons/mail/static/src/js/services/chat_manager.js:1536
 #, python-format
 msgid "You unpinned your conversation with <b>%s</b>."
 msgstr "Вы неприкрепили ваш разговор с <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:471
+#: code:addons/mail/static/src/js/services/chat_manager.js:1534
 #, python-format
 msgid "You unsubscribed from <b>%s</b>."
 msgstr "Вы отменили подписку для <b>%s</b>."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:217
+#: code:addons/mail/static/src/xml/discuss.xml:217
 #, python-format
 msgid "You:"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Your message has not been sent."
 msgstr ""
@@ -5660,23 +5511,35 @@ msgid "Your template should define email_from"
 msgstr "Ваш шаблон должен определять email_from"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "alias %s: %s"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
+msgid "base.partner.merge.automatic.wizard"
+msgstr "base.partner.merge.automatic.wizard"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "by"
 msgstr "по"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid ""
+"cannot be processed. This address\n"
+"    is used to collect replies and should not be used to directly contact"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "создано"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:315
+#: code:addons/mail/models/mail_thread.py:309
 #, python-format
 msgid "document"
 msgstr "документ"
@@ -5695,7 +5558,7 @@ msgstr "напр. Предложить обсудить"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "enable desktop notifications"
 msgstr "включить уведомления на рабочем столе"
@@ -5730,13 +5593,13 @@ msgid "has been"
 msgstr "был"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:282
+#: code:addons/mail/models/mail_alias.py:271
 #, python-format
 msgid "incorrectly configured alias"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:278
+#: code:addons/mail/models/mail_alias.py:267
 #, python-format
 msgid "incorrectly configured alias (unknown reference record)"
 msgstr ""
@@ -5757,19 +5620,19 @@ msgid "mail.alias.mixin"
 msgstr "mail.alias.mixin"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:943
+#: code:addons/mail/models/mail_thread.py:925
 #, python-format
 msgid "model %s does not accept document creation"
 msgstr "модель %s не принимает создание документа"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:938
+#: code:addons/mail/models/mail_thread.py:920
 #, python-format
 msgid "model %s does not accept document update"
 msgstr "модель %s не принимает обновление документа"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:931
+#: code:addons/mail/models/mail_thread.py:913
 #, python-format
 msgid ""
 "model %s does not accept document update, fall back on document creation"
@@ -5796,14 +5659,14 @@ msgstr "сейчас"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:177
+#: code:addons/mail/static/src/xml/thread.xml:181
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "on"
 msgstr "на"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid ""
 "posting a message without model should be with a null res_id (private "
@@ -5813,7 +5676,7 @@ msgstr ""
 "сообщение), полученным %s"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:917
+#: code:addons/mail/models/mail_thread.py:899
 #, python-format
 msgid ""
 "posting a message without model should be with a parent_id (private message)"
@@ -5845,13 +5708,13 @@ msgid "record:"
 msgstr "запись:"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:935
+#: code:addons/mail/models/mail_thread.py:917
 #, python-format
 msgid "reply to missing document (%s,%s)"
 msgstr "ответ на отсутствующий документ (%s,%s)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:928
+#: code:addons/mail/models/mail_thread.py:910
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
 msgstr ""
@@ -5864,40 +5727,45 @@ msgid "res.config.settings"
 msgstr "res.config.settings"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid "resetting thread_id"
 msgstr "Сброс thread_id"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:254
+#: code:addons/mail/models/mail_channel.py:252
 #, python-format
 msgid "restricted to channel members"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:287
+#: code:addons/mail/models/mail_alias.py:276
 #, python-format
 msgid "restricted to followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:291
+#: code:addons/mail/models/mail_alias.py:280
 #, python-format
 msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:899
 #: code:addons/mail/models/mail_thread.py:917
-#: code:addons/mail/models/mail_thread.py:935
-#: code:addons/mail/models/mail_thread.py:938
-#: code:addons/mail/models/mail_thread.py:943
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:920
+#: code:addons/mail/models/mail_thread.py:925
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "skipping"
 msgstr "пропуск"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "team."
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:20
 #, python-format
@@ -5905,13 +5773,18 @@ msgid "this document"
 msgstr "этого документа"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "unknown error"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:906
+#: code:addons/mail/models/mail_thread.py:888
 #, python-format
 msgid "unknown target model %s"
 msgstr "неизвестная целевая модель %s"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "using"
+msgstr ""
diff --git a/addons/mail/i18n/tr.po b/addons/mail/i18n/tr.po
index 8210f4e4495..65f6a140a96 100644
--- a/addons/mail/i18n/tr.po
+++ b/addons/mail/i18n/tr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Gökhan Erdoğdu <gokhan.erdogdu@mechsoft.com.tr>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Ramiz Deniz Öner <deniz@denizoner.com>, 2017
 # Ediz Duman <neps1192@gmail.com>, 2017
 # Murat Kaplan <muratk@projetgrup.com>, 2017
@@ -26,10 +26,10 @@
 # Levent Karakaş <levent@mektup.at>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.1\n"
+"Project-Id-Version: Odoo Server saas~11.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-13 14:36+0000\n"
-"PO-Revision-Date: 2017-12-13 14:36+0000\n"
+"POT-Creation-Date: 2018-03-22 14:10+0000\n"
+"PO-Revision-Date: 2018-03-22 14:10+0000\n"
 "Last-Translator: Levent Karakaş <levent@mektup.at>, 2017\n"
 "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -39,164 +39,59 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_data_notification_email_default
-msgid ""
-"\n"
-"% set company = ctx.get('company', user.company_id)\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"
-"        <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-"        <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
-"    </div>\n"
-"</div>\n"
-"% endif\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('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('has_button_follow'):\n"
-"        % if ctx.get('has_button_access'):\n"
-"           |\n"
-"        % endif\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=\"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=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
-"        % endfor\n"
-"        % endif\n"
-"    </td>\n"
-"    <td valign=\"center\" align=\"right\">\n"
-"        <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\">\n"
-"    </td>\n"
-"</tr>\n"
-"<tr>\n"
-"    <td colspan=\"2\" style=\"text-align:center;\">\n"
-"        <hr width=\"100%\"\n"
-"            style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
-"        % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
-"        <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n"
-"            <strong>Internal communication</strong>: Replying will post an internal note. Followers won't receive any email notification.\n"
-"        </p>\n"
-"        % endif\n"
-"    </td>\n"
-"</tr>\n"
-"</tbody></table>\n"
-"</div>\n"
-"% endif\n"
-"<div>\n"
-"    ${object.body | safe}\n"
-"</div>\n"
-"% if ctx.get('tracking'):\n"
-"    <ul>\n"
-"    % for tracking in ctx['tracking']\n"
-"        <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
-"    % endfor\n"
-"    </ul>\n"
-"% endif\n"
-"\n"
-"% if ctx.get('signature'):\n"
-"    ${ctx['signature'] | safe}\n"
-"% endif\n"
-"<br/>\n"
-"<p style=\"color: #555555;\">\n"
-"    Sent by\n"
-"    % if ctx.get('website_url'):\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 target=\"_blank\" 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:674
+#: code:addons/mail/models/mail_channel.py:680
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr "Bu kanal özeldir. Bu kanala katılabilmek için davet alınmalıdır."
 
 #. 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) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-msgstr ""
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:63
+#: code:addons/mail/static/src/js/services/chat_manager.js:1634
 #, python-format
 msgid "%d Messages"
 msgstr "%d Mesaj"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:31
+#: code:addons/mail/static/src/js/activity.js:88
 #, python-format
 msgid "%d days overdue"
 msgstr "%d gün geciken"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:248
+#: code:addons/mail/models/mail_template.py:279
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopya)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:236
+#: code:addons/mail/models/mail_thread.py:234
 #, python-format
 msgid "%s created"
 msgstr "%s oluşturuldu"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:81
+#: code:addons/mail/models/res_users.py:80
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s , %s ağına katıldı."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:211
 #, python-format
 msgid "&nbsp;("
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:179
+#: code:addons/mail/static/src/xml/thread.xml:184
 #, python-format
 msgid "(from"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,help:mail.field_mail_shortcode__shortcode_type
 msgid ""
 "* Smiley are only used for HTML code to display an image * Text (default "
 "value) is used to substitute text with another text"
@@ -211,7 +106,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:331
+#: code:addons/mail/static/src/xml/thread.xml:336
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr "-------- Daha eski mesajları göster --------"
@@ -238,7 +133,7 @@ msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:684
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -249,7 +144,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:584
+#: code:addons/mail/models/mail_channel.py:507
+#, python-format
+msgid ""
+"<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
+"href=\"#\" class=\"o_channel_redirect\" data-oe-"
+"id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:590
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -259,8 +163,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:508
-#: code:addons/mail/models/mail_channel.py:561
+#: code:addons/mail/models/mail_channel.py:514
+#: code:addons/mail/models/mail_channel.py:567
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -368,6 +272,11 @@ msgstr ""
 "<span class=\"o_stat_text\">Bağlam Eylemi</span>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+msgid "<span class=\"oe_inline\">days</span>"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>\n"
@@ -384,6 +293,13 @@ msgid "<strong> Feedback</strong>"
 msgstr ""
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid ""
+"<strong>Internal communication</strong>: Replying will post an internal "
+"note. Followers won't receive any email notification."
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>Only records checked in list view will be used.</strong><br/>\n"
@@ -396,9 +312,9 @@ msgid "<strong>Recommended Activities</strong>"
 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_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
 msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
@@ -419,115 +335,118 @@ msgid "Access Groups"
 msgstr "Erişim Grupları"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction
 msgid "Action Needed"
 msgstr "Eylem Gerekiyor"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__default
 msgid "Activated by default when subscribing."
 msgstr "Abone olurken varsayılan olarak etkinleştirilir."
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__active
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_search
 msgid "Active"
 msgstr "Aktif"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__active_domain
 msgid "Active domain"
 msgstr "Etkin alan adı"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/systray.xml:87
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_ids
-#: model:ir.model.fields,field_description:mail.field_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.model.fields,field_description:mail.field_account_invoice__activity_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_ids
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
 #: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 #: model:mail.message.subtype,name:mail.mt_activities
@@ -539,7 +458,7 @@ msgstr "Aktiviteler"
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:60
 #: model:ir.model,name:mail.model_mail_activity
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_type_id
+#: 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
@@ -553,6 +472,32 @@ msgid "Activity Mixin"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_state
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_state
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_state
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_state
+msgid "Activity State"
+msgstr "Aktivite Durumu"
+
+#. 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"
@@ -574,7 +519,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:87
+#: code:addons/mail/static/src/xml/discuss.xml:87
 #, python-format
 msgid "Add"
 msgstr "Ekle"
@@ -582,7 +527,7 @@ msgstr "Ekle"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:64
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_channel_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__channel_ids
 #, python-format
 msgid "Add Channels"
 msgstr "Kanallar Ekle"
@@ -590,7 +535,7 @@ msgstr "Kanallar Ekle"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:61
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_partner_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
 msgid "Add Followers"
@@ -603,22 +548,28 @@ msgid "Add Followers can only be done on a mail thread model"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,field_description:mail.field_mail_template_user_signature
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,field_description:mail.field_mail_template__user_signature
 msgid "Add Signature"
 msgstr "İmza Ekle"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:41
-#: code:addons/mail/static/src/xml/client_action.xml:186
+#: code:addons/mail/static/src/xml/discuss.xml:41
+#: code:addons/mail/static/src/xml/discuss.xml:186
 #, python-format
 msgid "Add a channel"
 msgstr "Kanal ekle"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:335
+#, python-format
+msgid "Add a new %(document)s or send an email to %(email_link)s"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:60
+#: code:addons/mail/static/src/xml/discuss.xml:60
 #, python-format
 msgid "Add a private channel"
 msgstr "Özel kanal ekleyin"
@@ -635,7 +586,7 @@ msgid "Add contacts to notify..."
 msgstr "Bilgilendirilecek kişi ekle..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
 msgid "Additional Contacts"
 msgstr "Ek Kişiler"
 
@@ -650,45 +601,45 @@ msgid "Advanced Settings"
 msgstr "Gelişmiş Ayarlar"
 
 #. 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_res_users_alias_id
+#: 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_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
 msgid "Alias"
 msgstr "Rumuz"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_contact
+#: 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
+#: model:ir.model.fields,field_description:mail.field_res_users__alias_contact
 msgid "Alias Contact Security"
 msgstr "Rumuz Kontak Güvenliği"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__alias_domain
 msgid "Alias Domain"
 msgstr "Rumuz Alanadı"
 
 #. module: mail
-#: 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_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
 msgid "Alias Name"
 msgstr "Rumuz Adı"
 
 #. module: mail
-#: 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_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
 msgid "Alias domain"
 msgstr "Rumuz etki alanı"
 
 #. module: mail
-#: 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_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
 msgid "Aliased Model"
 msgstr "Rumuzlama Modeli"
 
@@ -713,24 +664,24 @@ msgstr "Daima"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:198
+#: code:addons/mail/static/src/js/services/chat_manager.js:1328
 #, python-format
 msgid "Anonymous"
 msgstr "İsimsiz"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__no_auto_thread
 msgid ""
 "Answers do not go in the original document discussion thread. This has an "
 "impact on the generated message-id."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_id
 msgid "Applies to"
 msgstr "Buna uygulanır"
 
@@ -742,9 +693,14 @@ msgid "Apply"
 msgstr "Uygula"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+msgid "Archived"
+msgstr "Arşivlendi"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:45
-#: model:ir.model.fields,field_description:mail.field_mail_activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
 #, python-format
 msgid "Assigned to"
 msgstr "Görevlendirilen"
@@ -755,19 +711,19 @@ msgid "Attach a file"
 msgstr "Bir dosya ekle"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_template__attachment_ids
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Attachments"
 msgstr "Ekler"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_message_attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_message__attachment_ids
 msgid ""
 "Attachments are linked to a document through model / res_id and to the "
 "message through this field."
@@ -784,10 +740,10 @@ msgid "Authenticated Partners"
 msgstr "Kimliği Doğrulanmış İş Ortakları"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_id
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Author"
 msgstr "Yazan"
@@ -798,10 +754,10 @@ msgid "Author Signature (mass mail only)"
 msgstr "Yazanın İmzası (yalnızca toplu postalarda)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,help:mail.field_mail_mail_author_id
-#: model:ir.model.fields,help:mail.field_mail_message_author_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,help:mail.field_mail_mail__author_id
+#: model:ir.model.fields,help:mail.field_mail_message__author_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_id
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that"
 " did not match any partner."
@@ -810,27 +766,27 @@ msgstr ""
 " eposta adrsini tutabilir."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_avatar
 msgid "Author's avatar"
 msgstr "Yazanın Avatarı"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_public_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_public_id
 msgid "Authorized Group"
 msgstr "Yetkili Grup"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_template__auto_delete
 msgid "Auto Delete"
 msgstr "Otomatik Sil"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_ids
 msgid "Auto Subscription"
 msgstr "Otomatik Abonelik"
 
@@ -852,16 +808,16 @@ msgid "Be careful with channels following internal notifications"
 msgstr "Dahili bildirimleri izleyen kanallara dikkat edin"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
-#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
 msgid "Body"
 msgstr "Gövde"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,field_description:mail.field_res_users_message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_users__message_bounce
 msgid "Bounce"
 msgstr "Geri Dönme"
 
@@ -907,32 +863,32 @@ msgid "Canned Response / Shortcode"
 msgstr "Hazır yanıt / Kısa kod"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_cc
+#: model:ir.model.fields,help:mail.field_mail_mail__email_cc
 msgid "Carbon copy message recipients"
 msgstr "CC (carbon kopya) mesaj alıcıları"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,help:mail.field_mail_template_email_cc
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,help:mail.field_mail_template__email_cc
 msgid "Carbon copy recipients (placeholders may be used here)"
 msgstr "Alıcı karbon kopyası (burada yer tutucular kullanılabilir)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,help:mail.field_mail_activity_type_category
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,help:mail.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__category
 msgid "Category"
 msgstr "Kategori"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_cc
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_cc
 msgid "Cc"
 msgstr "İlgili Kopyası (CC)"
 
@@ -942,40 +898,40 @@ msgid "Change"
 msgstr "Değiştir"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field
 msgid "Changed Field"
 msgstr "Değişen Alan"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
 #: selection:mail.channel,channel_type:0
 msgid "Channel"
 msgstr "Kanal"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids
+#: 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_type
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_type
 msgid "Channel Type"
 msgstr "Kanal Türü"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:36
-#: code:addons/mail/static/src/xml/client_action.xml:172
+#: code:addons/mail/static/src/xml/discuss.xml:36
+#: code:addons/mail/static/src/xml/discuss.xml:172
 #: code:addons/mail/static/src/xml/systray.xml:19
 #: code:addons/mail/static/src/xml/systray.xml:36
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__channel_ids
 #: model:ir.ui.menu,name:mail.mail_channel_menu_settings
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
 #, python-format
@@ -990,7 +946,7 @@ msgstr "Kanallar / İş Ortak"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:168
+#: code:addons/mail/static/src/xml/discuss.xml:168
 #: code:addons/mail/static/src/xml/systray.xml:18
 #: code:addons/mail/static/src/xml/systray.xml:32
 #: model:ir.actions.client,name:mail.mail_channel_action_client_chat
@@ -1009,10 +965,10 @@ msgid "Chat Shortcode"
 msgstr "Sohbet Kısa Kodu"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__child_ids
 msgid "Child Messages"
 msgstr "Alt Mesajlar"
 
@@ -1022,23 +978,6 @@ msgid "Choose an example"
 msgstr "Bir örnek seçin"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:342
-#, 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:358
-#, python-format
-msgid "Click here to add new %s"
-msgstr "Yeni %s ekleme için burayı tıklayın"
-
-#. module: mail
-#: model:ir.actions.act_window,help:mail.mail_shortcode_action
-msgid "Click to define a new chat shortcode."
-msgstr ""
-
-#. module: mail
 #: selection:mail.channel.partner,fold_state:0
 msgid "Closed"
 msgstr "Kapalı"
@@ -1054,8 +993,8 @@ msgid "Comma-separated ids of recipient partners"
 msgstr "Alıcı iş ortakların kimlikleri virgülle ayrılmış"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_partner_to
-#: model:ir.model.fields,help:mail.field_mail_template_partner_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr ""
@@ -1068,8 +1007,8 @@ msgid "Comma-separated recipient addresses"
 msgstr "Virgülle ayrılmış alıcı adresleri"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,help:mail.field_mail_template_email_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,help:mail.field_mail_template__email_to
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr "Virgülle ayrılmış alıcı adresleri (burada yertutucular kullanılır)"
 
@@ -1088,8 +1027,8 @@ msgid "Compose Email"
 msgstr "Eposta Yaz"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_composition_mode
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__composition_mode
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__composition_mode
 msgid "Composition mode"
 msgstr "Kompozisyon modu"
 
@@ -1100,14 +1039,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:109
+#: code:addons/mail/static/src/xml/thread.xml:114
 #, python-format
 msgid "Congratulations, your inbox is empty"
 msgstr "Tebrikler, gelen kutunuz boş"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:647
+#: code:addons/mail/static/src/js/discuss.js:662
 #, python-format
 msgid "Congratulations, your inbox is empty!"
 msgstr ""
@@ -1124,20 +1063,20 @@ msgid "Content"
 msgstr "İçerik"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_body
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body
-#: model:ir.model.fields,field_description:mail.field_mail_message_body
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_body
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__body
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body
+#: model:ir.model.fields,field_description:mail.field_mail_message__body
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__body
 msgid "Contents"
 msgstr "İçerikler"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_fold_state
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__fold_state
 msgid "Conversation Fold State"
 msgstr "Konuşmanın Katlama Durumu"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_minimized
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_minimized
 msgid "Conversation is minimized"
 msgstr "Konuşma en aza indirildi"
 
@@ -1149,64 +1088,70 @@ msgid "Conversations"
 msgstr "Konuşmalar"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,help:mail.field_res_users_message_bounce
+#: model:ir.model.fields,help:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,help:mail.field_res_users__message_bounce
 msgid "Counter of the number of bounced emails for this contact"
 msgstr "Bu kişi için bounced eposta sayısı"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:307
+#: code:addons/mail/static/src/js/discuss.js:318
 #, python-format
 msgid "Create %s"
 msgstr "Oluştur %s"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__create_date
 msgid "Create Date"
 msgstr "Oluşturma Tarihi"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:350
+#, python-format
+msgid "Create a new %(document)s"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Created By"
 msgstr "Oluşturan"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_uid
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_uid
 msgid "Created by"
 msgstr "Oluşturan"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:41
-#: 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
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_date
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_date
 #, python-format
 msgid "Created on"
 msgstr "Oluşturulma"
@@ -1217,90 +1162,22 @@ msgid "Creation Month"
 msgstr "Oluşturma Ayı"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,help:mail.field_mail_mail_starred
-#: model:ir.model.fields,help:mail.field_mail_message_starred
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_starred
+#: model:ir.model.fields,help:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,help:mail.field_mail_mail__starred
+#: model:ir.model.fields,help:mail.field_mail_message__starred
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__starred
 msgid "Current user has a starred notification linked to this message"
 msgstr "Geçerli kullanıcı bu mesaja bağlı yıldızlı bir bildirime sahiptir"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_date
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__date
+#: model:ir.model.fields,field_description:mail.field_mail_message__date
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__date
 msgid "Date"
 msgstr "Tarih"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,help:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,help:mail.field_event_event_message_last_post
-#: model:ir.model.fields,help:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,help:mail.field_event_track_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_track_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
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,help:mail.field_note_note_message_last_post
-#: model:ir.model.fields,help:mail.field_product_product_message_last_post
-#: model:ir.model.fields,help:mail.field_product_template_message_last_post
-#: model:ir.model.fields,help:mail.field_project_project_message_last_post
-#: model:ir.model.fields,help:mail.field_project_task_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,help:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,help:mail.field_res_users_message_last_post
-#: model:ir.model.fields,help:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,help:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr "Onaylı son mesajın tarihi."
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Deadline"
 msgstr "Son Tarih"
@@ -1311,32 +1188,32 @@ msgid "Dear"
 msgstr "Sayın"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__default
 msgid "Default"
 msgstr "Öntanımlı"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,field_description:mail.field_mail_template_null_value
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,field_description:mail.field_mail_template__null_value
 msgid "Default Value"
 msgstr "Varsayılan Değer"
 
 #. module: mail
-#: 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_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
 msgid "Default Values"
 msgstr "Varsayılan Değerler"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__use_default_to
 msgid "Default recipients"
 msgstr "Varsayılan alıcılar"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,help:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,help:mail.field_mail_template__use_default_to
 msgid ""
 "Default recipients of the record:\n"
 "- partner (using id on a partner or the partner_id field) OR\n"
@@ -1347,26 +1224,31 @@ msgstr ""
 "- eposta (eposta gönderen veya eposta alanı kullanılarak)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.actions.act_window,help:mail.mail_shortcode_action
+msgid "Define a new chat shortcode"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete Emails"
 msgstr "E-postaları Sil"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete_message
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete_message
 msgid "Delete Message Copy"
 msgstr "Mesaj Kopyalamayı Sil"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete sent emails (mass mailing only)"
 msgstr "Gönderilen e-postaları sil (yalnızca toplu e-posta ile gönderim)"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:320
+#: code:addons/mail/static/src/xml/thread.xml:325
 #, python-format
 msgid "Delete this attachment"
 msgstr "Bu eki sil"
@@ -1377,15 +1259,15 @@ msgid "Delivery Failed"
 msgstr "Gönderim Başarısız"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_description
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_description
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_description
+#: model:ir.model.fields,field_description:mail.field_mail_channel__description
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__description
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__description
 #: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
 msgid "Description"
 msgstr "Tanım"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_description
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__description
 msgid ""
 "Description that will be added in the message posted for this subtype. If "
 "void, the name will be added instead."
@@ -1395,7 +1277,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:46
+#: code:addons/mail/static/src/xml/discuss.xml:46
 #, python-format
 msgid "Direct Messages"
 msgstr "Doğrudan Mesajlar"
@@ -1426,26 +1308,26 @@ msgid "Discussions"
 msgstr "Tartışmalar"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_display_name
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__display_name
+#: 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_subtype__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_notification__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_thread__display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__display_name
 msgid "Display Name"
 msgstr "Görünüm Adı"
 
@@ -1459,13 +1341,13 @@ msgstr ""
 "göster"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_res_name
+#: 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
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete_message
 msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
@@ -1477,7 +1359,12 @@ msgid "Document Followers"
 msgstr "Belge Takipçileri"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_name
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_model_id
+msgid "Document Model"
+msgstr "Doküman Modeli"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_name
 msgid "Document Name"
 msgstr ""
 
@@ -1498,28 +1385,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:296
+#: code:addons/mail/static/src/xml/thread.xml:301
 #, python-format
 msgid "Download this PDF"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:272
-#: code:addons/mail/static/src/xml/thread.xml:285
-#: code:addons/mail/static/src/xml/thread.xml:308
+#: code:addons/mail/static/src/xml/thread.xml:277
+#: code:addons/mail/static/src/xml/thread.xml:290
+#: code:addons/mail/static/src/xml/thread.xml:313
 #, python-format
 msgid "Download this attachment"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity__date_deadline
 msgid "Due Date"
 msgstr "Vade Tarihi"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:37
+#: code:addons/mail/static/src/js/activity.js:94
 #, python-format
 msgid "Due in %d days"
 msgstr ""
@@ -1551,7 +1438,7 @@ msgid "Edit subscription"
 msgstr "Abonelik düzenle"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_email
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_email
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 #: model:mail.activity.type,name:mail.mail_activity_data_email
 #: selection:mail.compose.message,message_type:0
@@ -1586,12 +1473,12 @@ msgid "Email Search"
 msgstr "E-posta Ara"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_email_status
+#: model:ir.model.fields,field_description:mail.field_mail_notification__email_status
 msgid "Email Status"
 msgstr "E-posta Durumu"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__template_id
 msgid "Email Template"
 msgstr "Eposta Şablonu"
 
@@ -1611,7 +1498,7 @@ msgid "Email Thread"
 msgstr "E-posta İşlemleri"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_alias_id
+#: model:ir.model.fields,help:mail.field_res_users__alias_id
 msgid ""
 "Email address internally associated with this user. Incoming emails will "
 "appear in the user's notifications."
@@ -1620,10 +1507,10 @@ msgstr ""
 "bildirimlerinde görünecektir."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_email_from
-#: model:ir.model.fields,help:mail.field_mail_mail_email_from
-#: model:ir.model.fields,help:mail.field_mail_message_email_from
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,help:mail.field_mail_compose_message__email_from
+#: model:ir.model.fields,help:mail.field_mail_mail__email_from
+#: model:ir.model.fields,help:mail.field_mail_message__email_from
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__email_from
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found and replaces the author_id field in the chatter."
@@ -1659,7 +1546,7 @@ msgid "Error during communication with the publisher warranty server."
 msgstr "Yayıncı garanti sunucuyla iletişim sırasında hata oluştu."
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:302
+#: code:addons/mail/models/mail_mail.py:300
 #, python-format
 msgid ""
 "Error without exception. Probably due do sending an email without computed "
@@ -1700,7 +1587,7 @@ msgid "Extended Filters..."
 msgstr "Gelişmiş Filtreler..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_fail_counter
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__fail_counter
 msgid "Fail Mail"
 msgstr "Posta Hatası"
 
@@ -1710,64 +1597,64 @@ msgid "Failed"
 msgstr "Başarısız"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:374
+#: code:addons/mail/models/mail_template.py:368
 #, python-format
 msgid "Failed to render template %r using values %r"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,field_description:mail.field_mail_mail__failure_reason
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Failure Reason"
 msgstr "Başarısızlık Nedeni"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
 msgid ""
 "Failure reason. This is usually the exception thrown by the email server, "
 "stored to ease the debugging of mailing issues."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred_partner_ids
 msgid "Favorited By"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:215
-#: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
+#: code:addons/mail/static/src/js/activity.js:245
+#: model:ir.model.fields,field_description:mail.field_mail_activity__feedback
 #, python-format
 msgid "Feedback"
 msgstr "Geri Bildirim"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_object_field
 msgid "Field"
 msgstr "Alan"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:24
+#: code:addons/mail/models/ir_model.py:30
 #, python-format
 msgid "Field \"Mail Thread\" cannot be changed to \"False\"."
 msgstr "\"Posta Konusu\" alanı \"Yanlış\" olarak değiştirilemez."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_desc
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_desc
 msgid "Field Description"
 msgstr "Alan Açıklaması"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_type
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_type
 msgid "Field Type"
 msgstr "Alan Türü"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__relation_field
 msgid ""
 "Field used to link the related model to the subtype model when using "
 "automatic subscription on a related document. The field is used to compute "
@@ -1783,8 +1670,8 @@ msgid "Fields"
 msgstr "Alanlar"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,help:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,help:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,help:mail.field_mail_template__copyvalue
 msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
@@ -1799,7 +1686,6 @@ msgstr "Katlanmış"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:696
 #: code:addons/mail/static/src/xml/followers.xml:20
 #, python-format
 msgid "Follow"
@@ -1807,208 +1693,211 @@ msgstr "Takip Et"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_followers
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_follower_ids
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: model:ir.ui.view,arch_db:mail.view_followers_tree
 msgid "Followers"
 msgstr "Takipçiler"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_channel_ids
 msgid "Followers (Channels)"
 msgstr "İzleyiciler (Kanallar)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_partner_ids
 msgid "Followers (Partners)"
 msgstr "İzleyiciler (İş ortakları)"
 
@@ -2037,18 +1926,18 @@ msgid "Following"
 msgstr "Takip Ediliyor"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_icon
-#: model:ir.model.fields,help:mail.field_mail_activity_type_icon
+#: 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_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
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_from
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_from
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__email_from
 msgid "From"
 msgstr "Kimden:"
 
@@ -2071,7 +1960,7 @@ msgid "Gateway"
 msgstr "Ağ Geçidi"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:55
+#: code:addons/mail/models/res_users.py:54
 #, python-format
 msgid "Go to the configuration panel"
 msgstr "Yapılandırma paneline git"
@@ -2114,49 +2003,54 @@ msgid "Has attachments"
 msgstr "Ekleri var"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_headers
+#: model:ir.model.fields,field_description:mail.field_mail_mail__headers
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Headers"
 msgstr "Başlıklar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_hidden
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Hello"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
 msgid "Hidden"
 msgstr "Gizli"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_hidden
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__hidden
 msgid "Hide the subtype in the follower options"
 msgstr "Takipçi seçeneklerinde alt tipi gizle"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_id
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__id
+#: 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_subtype__id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__id
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__id
+#: model:ir.model.fields,field_description:mail.field_mail_template__id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__id
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mail
-#: 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_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
 msgid ""
 "ID of the parent record holding the alias (example: project holding the task"
 " creation alias)"
@@ -2165,163 +2059,165 @@ msgstr ""
 "barındıran proje)"
 
 #. 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
+#: 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 "İkon"
 
 #. 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
+#: 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"
 msgstr "İzlenen kaynağın ID si"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:119
-#: code:addons/mail/static/src/xml/client_action.xml:203
+#: code:addons/mail/static/src/xml/discuss.xml:119
+#: code:addons/mail/static/src/xml/discuss.xml:203
 #, python-format
 msgid "Idle"
 msgstr "Idle"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,help:mail.field_event_event_message_unread
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread
-#: model:ir.model.fields,help:mail.field_event_track_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,help:mail.field_note_note_message_unread
-#: model:ir.model.fields,help:mail.field_product_product_message_unread
-#: model:ir.model.fields,help:mail.field_product_template_message_unread
-#: model:ir.model.fields,help:mail.field_project_project_message_unread
-#: model:ir.model.fields,help:mail.field_project_task_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread
-#: model:ir.model.fields,help:mail.field_res_users_message_unread
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,help:mail.field_event_event__message_unread
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread
+#: model:ir.model.fields,help:mail.field_event_track__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,help:mail.field_note_note__message_unread
+#: model:ir.model.fields,help:mail.field_product_product__message_unread
+#: model:ir.model.fields,help:mail.field_product_template__message_unread
+#: model:ir.model.fields,help:mail.field_project_project__message_unread
+#: model:ir.model.fields,help:mail.field_project_task__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread
+#: model:ir.model.fields,help:mail.field_res_users__message_unread
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread
 msgid "If checked new messages require your attention."
 msgstr "Eğer işaretliyse yeni iletiler ilginizi gerektirir."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,help:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction
 msgid "If checked, new messages require your attention."
 msgstr "İşaretliyse, yeni mesajlar dikkatinize sunulacak."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
 msgid ""
 "If checked, the partners will receive an email warning they have been added "
 "in the document's followers."
@@ -2330,8 +2226,8 @@ msgstr ""
 "başladıklarına dairbir e-posta uyarısı alır."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,help:mail.field_mail_template_user_signature
+#: model:ir.model.fields,help:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,help:mail.field_mail_template__user_signature
 msgid ""
 "If checked, the user's signature will be appended to the text version of the"
 " message"
@@ -2340,8 +2236,8 @@ msgstr ""
 "eklenecektir"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_opt_out
-#: model:ir.model.fields,help:mail.field_res_users_opt_out
+#: model:ir.model.fields,help:mail.field_res_partner__opt_out
+#: model:ir.model.fields,help:mail.field_res_users__opt_out
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails for mass "
 "mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
@@ -2353,22 +2249,22 @@ msgstr ""
 "sağlar."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_mail__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_scheduled_date
-#: model:ir.model.fields,help:mail.field_mail_template_scheduled_date
+#: model:ir.model.fields,help:mail.field_email_template_preview__scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_template__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible. Jinja2 placeholders may be used."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
 msgid ""
 "If you have setup a catch-all email domain redirected to the Odoo server, "
 "enter the domain name here."
@@ -2377,26 +2273,26 @@ msgstr ""
 "yönlendirmek istiyorsanız buraya bir alan adı girin."
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:141
+#: code:addons/mail/models/mail_alias.py:130
 #, python-format
 msgid "Inactive Alias"
 msgstr "Pasif rumuz"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:655
-#: code:addons/mail/static/src/xml/client_action.xml:22
-#: code:addons/mail/static/src/xml/client_action.xml:154
-#: code:addons/mail/static/src/xml/client_action.xml:164
+#: code:addons/mail/static/src/js/services/chat_manager.js:84
+#: code:addons/mail/static/src/xml/discuss.xml:22
+#: code:addons/mail/static/src/xml/discuss.xml:154
+#: code:addons/mail/static/src/xml/discuss.xml:164
 #, python-format
 msgid "Inbox"
 msgstr "Gelen Kutusu"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,help:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,help:mail.field_mail_message_parent_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,help:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,help:mail.field_mail_message__parent_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__parent_id
 msgid "Initial thread message."
 msgstr "İlk mesaj konusu."
 
@@ -2407,12 +2303,12 @@ msgid "Integrations"
 msgstr "Entegrasyonlar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__internal
 msgid "Internal Only"
 msgstr "Sadece Dahili"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:99
+#: code:addons/mail/models/mail_alias.py:88
 #, python-format
 msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
@@ -2422,7 +2318,8 @@ msgstr ""
 "'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1794
+#: code:addons/mail/models/mail_thread.py:1811
+#: code:addons/mail/models/mail_thread.py:1996
 #, python-format
 msgid ""
 "Invalid record set: should be called as model (without records) or on "
@@ -2430,14 +2327,14 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/controllers/main.py:41
+#: code:addons/mail/controllers/main.py:40
 #, python-format
 msgid "Invalid token in route %s"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "Invitation"
 msgstr "Davet"
@@ -2450,8 +2347,8 @@ msgstr "Şunu takip etmek için davet : %s: %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:44
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:44
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite"
 msgstr "Davet Et"
@@ -2465,15 +2362,15 @@ msgstr "Takipci Davet Edin"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:31
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:29
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite people"
 msgstr "İnsanları davet et"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:867
+#: code:addons/mail/static/src/js/discuss.js:882
 #, python-format
 msgid "Invite people to #%s"
 msgstr ""
@@ -2489,95 +2386,96 @@ msgid "Invited people only"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_note_note_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_product_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_template_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_project_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_task_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_users_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_note_note__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_product__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_template__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_project__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_task__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_users__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_is_follower
 msgid "Is Follower"
 msgstr "Takipçi mi"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification
+#: model:ir.model.fields,field_description:mail.field_mail_mail__notification
 msgid "Is Notification"
 msgstr "Bildirim mi"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_read
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_read
 msgid "Is Read"
 msgstr "Okuyanmı mu"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_subscribed
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_subscribed
 msgid "Is Subscribed"
 msgstr "Abone mi"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_member
 msgid "Is a member"
 msgstr "Üye mi"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
 msgid "Is pinned on the interface"
 msgstr "Arayüzde sabitlenmiş mi"
 
@@ -2592,144 +2490,76 @@ msgid "Join a group"
 msgstr "Bir Gruba Katılın"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_lang
-#: model:ir.model.fields,field_description:mail.field_mail_template_lang
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__lang
+#: model:ir.model.fields,field_description:mail.field_mail_template__lang
 msgid "Language"
 msgstr "Dil"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_track_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_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_test_simple_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_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
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,field_description:mail.field_note_note_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_product_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_template_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_project_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_task_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_users_message_last_post
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_last_post
-msgid "Last Message Date"
-msgstr "Son Mesaj Tarihi"
-
-#. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner___last_update
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message___last_update
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract___last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message____last_update
+#: 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_subtype____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_notification____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_template____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_thread____last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract____last_update
 msgid "Last Modified on"
 msgstr "Son Güncelleme"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_last_seen_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_seen_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_last_seen_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__seen_message_id
 msgid "Last Seen"
 msgstr "Son Görülen"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_uid
-#: 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_tracking_value_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_uid
 msgid "Last Updated by"
 msgstr "Son Güncelleyen"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_date
-#: 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_tracking_value_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_date
 msgid "Last Updated on"
 msgstr "Son Güncelleme"
 
@@ -2753,37 +2583,37 @@ msgstr "Ayrıl"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:687
-#: code:addons/mail/static/src/xml/client_action.xml:112
+#: code:addons/mail/models/mail_channel.py:693
+#: code:addons/mail/static/src/xml/discuss.xml:112
 #, python-format
 msgid "Leave this channel"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_channel_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__channel_ids
 msgid ""
 "List of channels that will be added as listeners of the current document."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__partner_ids
 msgid ""
 "List of partners that will be added as follower of the current document."
 msgstr "Bu belgenin takipçisi olarak eklenecek iş ortakları."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:698
+#: code:addons/mail/models/mail_channel.py:704
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__channel_id
 msgid "Listener"
 msgstr "Dinleyici"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_partner_ids
 msgid "Listeners"
 msgstr "Dinleyeciler"
 
@@ -2799,7 +2629,7 @@ msgstr "Canlı Sohbetler"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:31
+#: code:addons/mail/static/src/js/chatter_composer.js:30
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Log"
@@ -2823,8 +2653,8 @@ msgid "Log an Activity"
 msgstr "Aktivite Oluştur"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__is_log
 msgid "Log an Internal Note"
 msgstr "Bir İç Not Ekleme"
 
@@ -2843,10 +2673,10 @@ msgid "Log or schedule an activity"
 msgstr "Bir not veya aktivite ekle"
 
 #. 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
+#: 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 ""
 
@@ -2856,13 +2686,13 @@ msgid "Mail Channel Form"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:369
+#: code:addons/mail/models/mail_mail.py:367
 #, python-format
 msgid "Mail Delivery Failed"
 msgstr "Posta Teslim Başarısız"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,field_description:mail.field_ir_model__is_mail_thread
 #: model:ir.ui.view,arch_db:mail.model_search_view
 msgid "Mail Thread"
 msgstr "Posta Konusu"
@@ -2873,7 +2703,7 @@ msgid "Mail Tracking Value"
 msgstr "Posta İzleme Değeri"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_notification
+#: model:ir.model.fields,help:mail.field_mail_mail__notification
 msgid "Mail has been created to notify people of an existing mail.message"
 msgstr "Varolan bir mail.message halkı bilgilendirmek için posta oluşturuldu"
 
@@ -2885,7 +2715,7 @@ msgid "Mail: Email Queue Manager"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:832
+#: code:addons/mail/models/mail_thread.py:813
 #, python-format
 msgid "Mailbox unavailable - %s"
 msgstr ""
@@ -2904,14 +2734,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all as read"
 msgstr "Hepsini okundu olarak işaretle"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all read"
 msgstr "Hepsini okundu işaretle"
@@ -2923,15 +2753,15 @@ msgstr "Bitti olarak İşaretle"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:206
+#: code:addons/mail/static/src/xml/thread.xml:211
 #, python-format
 msgid "Mark as Read"
 msgstr "Hepsini Okundu İşaretle"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:153
-#: code:addons/mail/static/src/xml/thread.xml:200
+#: code:addons/mail/static/src/xml/thread.xml:158
+#: code:addons/mail/static/src/xml/thread.xml:205
 #, python-format
 msgid "Mark as Todo"
 msgstr "Yapılacak olarak İşaretle"
@@ -2944,12 +2774,12 @@ msgid "Mark as done"
 msgstr "Yapıldı olarak işaretle"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_medium
 msgid "Medium-sized photo"
 msgstr "Orta boy fotoğraf"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,help:mail.field_mail_channel__image_medium
 msgid ""
 "Medium-sized photo of the group. It is automatically resized as a 128x128px "
 "image, with aspect ratio preserved. Use this field in form views or some "
@@ -2971,7 +2801,7 @@ msgid "Members"
 msgstr "Üyeler"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,help:mail.field_mail_channel__group_ids
 msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
@@ -2980,16 +2810,22 @@ msgstr ""
 "duydulduğunda aboneliklerini elle değiştirebileceklerini unutmayın."
 
 #. module: mail
+#: code:addons/mail/wizard/base_partner_merge.py:13
+#, python-format
+msgid "Merged with the following partners:"
+msgstr "Aşağıdaki iş ortakları ile birleştirilmiş:"
+
+#. 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.model.fields,field_description:mail.field_mail_mail__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Message"
 msgstr "Mesaj"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
 msgid "Message ID"
 msgstr "Mesaj ID"
 
@@ -2999,37 +2835,37 @@ msgid "Message Notifications"
 msgstr "Mesaj Bildirimleri"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_mail__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_message__record_name
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__record_name
 msgid "Message Record Name"
 msgstr "Mesaj Kayıt Adı"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__name
 msgid "Message Type"
 msgstr "Mesaj Tipi"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_to
+#: model:ir.model.fields,help:mail.field_mail_mail__email_to
 msgid "Message recipients (emails)"
 msgstr "Posta alıcıları (eposta)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_references
+#: model:ir.model.fields,help:mail.field_mail_mail__references
 msgid "Message references, such as identifiers of previous messages"
 msgstr "Mesaj referansları, tanımlayıcılar ya da önceki mesajlar"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
+#: code:addons/mail/static/src/xml/discuss.xml:124
 #, python-format
 msgid "Message sent in \""
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__name
 msgid ""
 "Message subtype gives a more precise type on the message, especially for "
 "system notifications. For example, it can be a notification related to a new"
@@ -3049,7 +2885,7 @@ msgid "Message subtypes"
 msgstr "Mesaj alt-tipleri"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_followers_subtype_ids
+#: model:ir.model.fields,help:mail.field_mail_followers__subtype_ids
 msgid ""
 "Message subtypes followed, meaning subtypes that will be pushed onto the "
 "user's Wall."
@@ -3058,10 +2894,10 @@ msgstr ""
 "anlamına gelir."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,help:mail.field_mail_mail_message_type
-#: model:ir.model.fields,help:mail.field_mail_message_message_type
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,help:mail.field_mail_mail__message_type
+#: model:ir.model.fields,help:mail.field_mail_message__message_type
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_type
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
@@ -3070,87 +2906,88 @@ msgstr ""
 "kullanıcı cevaplar gibi diğer mesajlar için Yorum"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,help:mail.field_mail_mail_message_id
-#: model:ir.model.fields,help:mail.field_mail_message_message_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,help:mail.field_mail_mail__message_id
+#: model:ir.model.fields,help:mail.field_mail_message__message_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_id
 msgid "Message unique identifier"
 msgstr "Tekil mesaj tanımlayıcısı"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_id
 msgid "Message-Id"
 msgstr "Mesaj-Id"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_ids
 #: model:ir.ui.menu,name:mail.menu_mail_message
 #: model:ir.ui.view,arch_db:mail.view_message_tree
 msgid "Messages"
@@ -3169,7 +3006,7 @@ msgid "Messages can be <b>starred</b> to remind you to check back later."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__internal
 msgid ""
 "Messages with internal subtypes will be visible only by employees, aka "
 "members of base_user group"
@@ -3178,20 +3015,20 @@ msgstr ""
 "tarafından görüntülenebilir."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_res_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_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
 msgid "Model"
 msgstr "Model"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_res_model
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__res_model
 msgid "Model of the followed resource"
 msgstr "İzlenen kaynağın modeli"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__res_model
 msgid ""
 "Model the subtype applies to. If False, this subtype applies to all models."
 msgstr ""
@@ -3220,25 +3057,25 @@ msgid "My Activities"
 msgstr "Aktivitelerim"
 
 #. 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_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.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Name"
 msgstr "İsim"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_record_name
-#: model:ir.model.fields,help:mail.field_mail_mail_record_name
-#: model:ir.model.fields,help:mail.field_mail_message_record_name
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,help:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,help:mail.field_mail_mail__record_name
+#: model:ir.model.fields,help:mail.field_mail_message__record_name
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__record_name
 msgid "Name get of the related document."
 msgstr "İlgili belge adı."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,help:mail.field_mail_template_report_name
+#: model:ir.model.fields,help:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,help:mail.field_mail_template__report_name
 msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
@@ -3247,71 +3084,71 @@ msgstr ""
 "Uzantı atlanabilir ve sonra çıktı türünden gelebilir."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_mail_needaction
-#: model:ir.model.fields,help:mail.field_mail_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_mail__needaction
+#: model:ir.model.fields,help:mail.field_mail_message__needaction
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__needaction
 #: model:ir.ui.view,arch_db:mail.view_message_search
 msgid "Need Action"
 msgstr "Eylem Gerektiriyor"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_res_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
 msgid "Needaction Recipient"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:138
+#: code:addons/mail/static/src/xml/discuss.xml:138
 #, python-format
 msgid "New Channel"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:137
+#: code:addons/mail/static/src/xml/discuss.xml:137
 #, python-format
 msgid "New Message"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_char
 msgid "New Value Char"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_datetime
 msgid "New Value Datetime"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_float
 msgid "New Value Float"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_integer
 msgid "New Value Integer"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_monetary
 msgid "New Value Monetary"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_text
 msgid "New Value Text"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:55
-#: code:addons/mail/static/src/js/window_manager.js:139
+#: code:addons/mail/static/src/js/services/chat_manager.js:1625
+#: code:addons/mail/static/src/js/services/chat_window_manager.js:283
 #: code:addons/mail/static/src/xml/systray.xml:12
 #: code:addons/mail/static/src/xml/systray.xml:21
 #, python-format
@@ -3320,21 +3157,21 @@ msgstr "Yeni mesaj"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:233
+#: code:addons/mail/static/src/xml/thread.xml:238
 #, python-format
 msgid "New messages"
 msgstr "Yeni mesajlar"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:110
+#: code:addons/mail/static/src/xml/thread.xml:115
 #, python-format
 msgid "New messages appear here."
 msgstr "Yeni mesajlar burada görünür."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:97
+#: code:addons/mail/static/src/js/discuss.js:99
 #, python-format
 msgid "New people"
 msgstr "Yeni insanlar"
@@ -3345,85 +3182,85 @@ msgid "Next Activities"
 msgstr "Sonraki Aktiviteler"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_date_deadline
 msgid "Next Activity Deadline"
 msgstr "Sonraki Faaliyet Zaman Sınırı"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_summary
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_summary
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_summary
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_summary
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_summary
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_summary
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_summary
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_summary
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_summary
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_summary
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_summary
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_summary
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_summary
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_summary
 msgid "Next Activity Summary"
 msgstr "Sonraki Faaliyet Özeti"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_type_id
 msgid "Next Activity Type"
 msgstr "Sonraki Faaliyet Türü"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,field_description:mail.field_mail_activity__has_recommended_activities
 msgid "Next activities available"
 msgstr ""
 
@@ -3466,28 +3303,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:113
+#: code:addons/mail/static/src/xml/thread.xml:118
 #, python-format
 msgid "No starred message"
 msgstr "Yıldızlı mesaj yok"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__no_auto_thread
 msgid "No threading for answers"
 msgstr "Cevaplar için hiçbir iş parçacığı yok"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_note
+#: model:ir.model.fields,field_description:mail.field_mail_activity__note
 #: model:mail.message.subtype,name:mail.mt_note
 msgid "Note"
 msgstr "Bilgi"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:157
+#: code:addons/mail/static/src/xml/thread.xml:162
 #, python-format
 msgid "Note by"
 msgstr "Bilgilendiren"
@@ -3498,249 +3335,254 @@ msgid "Notification"
 msgstr "Bildirimler"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_users_notification_type
+#: model:ir.model.fields,field_description:mail.field_res_users__notification_type
 msgid "Notification Management"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_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 "Bildirimler"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers"
 msgstr "Takipçileri bilgilendir"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_notify
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_notify
+#: model:ir.model.fields,help:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers of the document (mass post only)"
 msgstr "Belgenin takipçilerini bilgilendir (sadece toplu e-postalama)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of Actions"
 msgstr "Eylemlerin Sayısı"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_days
+#: 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_payment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of messages which requires an action"
 msgstr "Eylem gerektiren mesaj sayısı"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread_counter
 msgid "Number of unread messages"
 msgstr "Okunmamış mesaj sayısı"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model:ir.ui.view,arch_db:mail.message_notification_email
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Odoo"
 msgstr "Odoo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:895
+#: code:addons/mail/static/src/js/discuss.js:910
 #, python-format
 msgid ""
 "Odoo has now the permission to send you native notifications on this device."
@@ -3748,14 +3590,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "Odoo needs your permission to"
 msgstr "Odoo için izniniz gerekiyor"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:892
+#: code:addons/mail/static/src/js/discuss.js:907
 #, python-format
 msgid ""
 "Odoo will not have the permission to send native notifications on this "
@@ -3764,38 +3606,38 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:120
+#: code:addons/mail/static/src/xml/discuss.xml:120
 #, python-format
 msgid "Offline"
 msgstr "Çevrimdışı"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_char
 msgid "Old Value Char"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_datetime
 msgid "Old Value DateTime"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_float
 msgid "Old Value Float"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_integer
 msgid "Old Value Integer"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_monetary
 msgid "Old Value Monetary"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_text
 msgid "Old Value Text"
 msgstr ""
 
@@ -3822,14 +3664,14 @@ msgstr "Bir Takipçi"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:118
-#: code:addons/mail/static/src/xml/client_action.xml:202
+#: code:addons/mail/static/src/xml/discuss.xml:118
+#: code:addons/mail/static/src/xml/discuss.xml:202
 #, python-format
 msgid "Online"
 msgstr "Online"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:22
+#: code:addons/mail/models/ir_model.py:28
 #, python-format
 msgid "Only custom models can be modified."
 msgstr "Sadece özel modeller değiştirilebilir."
@@ -3851,14 +3693,14 @@ msgstr "Üst Belgeyi Aç"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Open channel settings"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:187
+#: code:addons/mail/static/src/xml/discuss.xml:187
 #, python-format
 msgid "Open chat"
 msgstr ""
@@ -3871,15 +3713,15 @@ 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
+#: 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"
 msgstr "Çekildi"
 
 #. module: mail
-#: 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_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
 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 "
@@ -3889,8 +3731,8 @@ msgstr ""
 " ID i. Ayarlanırsa, yeni kayıtların oluşumunu tamamen engelleyecektir."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,help:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,help:mail.field_mail_template__mail_server_id
 msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
@@ -3899,14 +3741,14 @@ msgstr ""
 "öncelikli olan kullanılacaktır."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_template
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_template
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_template
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_template
 msgid "Optional report to print and attach"
 msgstr "Yazdırıp eklemek için seçmeli çıktı"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_lang
-#: model:ir.model.fields,help:mail.field_mail_template_lang
+#: model:ir.model.fields,help:mail.field_email_template_preview__lang
+#: model:ir.model.fields,help:mail.field_mail_template__lang
 msgid ""
 "Optional translation language (ISO code) to select when sending out an "
 "email. If not set, the english version will be used. This should usually be "
@@ -3918,8 +3760,8 @@ msgstr ""
 "sağlayan bir yrttutucu ifadesidir, örn. ${object.partner_id.lang}."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,help:mail.field_mail_template_null_value
+#: model:ir.model.fields,help:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,help:mail.field_mail_template__null_value
 msgid "Optional value to use if the target field is empty"
 msgstr "Hedef alanı boşsa kullanılacak seçimli değer"
 
@@ -3934,8 +3776,8 @@ msgid "Outgoing"
 msgstr "Çıkış Bekleyen"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__mail_server_id
 msgid "Outgoing Mail Server"
 msgstr "Giden Mail Server"
 
@@ -3945,10 +3787,10 @@ msgid "Outgoing Mails"
 msgstr "Giden Postalar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_server_id
 msgid "Outgoing mail server"
 msgstr "Giden mail sunucusu"
 
@@ -3962,12 +3804,12 @@ msgstr "Giden mail sunucusu"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -3981,43 +3823,43 @@ msgid "Override author's email"
 msgstr "Yazarın e-postasını geçersiz kılar."
 
 #. module: mail
-#: 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_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
 msgid "Owner"
 msgstr "Sahibi"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__parent_id
 msgid "Parent"
 msgstr "Üst"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__parent_id
 msgid "Parent Message"
 msgstr "Üst Mesaj"
 
 #. module: mail
-#: 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_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
 msgid "Parent Model"
 msgstr "Üst Model"
 
 #. module: mail
-#: 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_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
 msgid "Parent Record Thread ID"
 msgstr "Üst Kayıt Konu ID"
 
 #. module: mail
-#: 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_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
 msgid ""
 "Parent model holding the alias. The model holding the alias reference is not"
 " necessarily the model given by alias_model_id (example: project "
@@ -4028,7 +3870,7 @@ msgstr ""
 "(parent_model) ve görev (model))"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__parent_id
 msgid ""
 "Parent subtype, used for automatic subscription. This field is not correctly"
 " named. For example on a project, the parent_id of project subtypes refers "
@@ -4053,42 +3895,42 @@ msgstr ""
 "İş Otaklarına sorulmadan toplu posta kampanyaları dahil edilmeyecekler"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction_partner_ids
 msgid "Partners with Need Action"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_template__auto_delete
 msgid "Permanently delete this email after sending it, to save space"
 msgstr "Bu mesajı gönderdikten sonra yerden kazanmak için sil"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:891
+#: code:addons/mail/static/src/js/discuss.js:906
 #, python-format
 msgid "Permission denied"
 msgstr "İzin reddedildi"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:894
+#: code:addons/mail/static/src/js/discuss.js:909
 #, python-format
 msgid "Permission granted"
 msgstr "İzin verildi"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image
 msgid "Photo"
 msgstr "Resim"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,field_description:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,field_description:mail.field_mail_template__copyvalue
 msgid "Placeholder Expression"
 msgstr "Yer Tutucu İfade"
 
@@ -4102,12 +3944,12 @@ msgstr "Yer Tutucu İfade"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4123,46 +3965,56 @@ msgid "Planned activities"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__days
+msgid "Planned in"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:282
+#: code:addons/mail/static/src/xml/thread.xml:287
 #, python-format
 msgid "Play this video"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:158
+#: code:addons/mail/static/src/js/chatter_composer.js:157
 #, python-format
 msgid "Please complete customer's informations"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:84
+#: code:addons/mail/static/src/js/many2many_tags_email.js:96
 #, python-format
 msgid "Please complete customer's informations and email"
 msgstr ""
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Please contact us instead using"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Please, wait while the file is uploading."
 msgstr "Dosya yüklenirken bekleyin, lütfen."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_notification_type
+#: model:ir.model.fields,help:mail.field_res_users__notification_type
 msgid ""
 "Policy on how to handle Chatter notifications:\n"
-"- Emails: notifications are sent to your email\n"
-"- Odoo: notifications appear in your Odoo Inbox"
+"- Handle by Emails: notifications are sent to your email address\n"
+"- Handle in Odoo: notifications appear in your Odoo Inbox"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_alias_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_channel_alias_contact
-#: model:ir.model.fields,help:mail.field_res_users_alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_channel__alias_contact
+#: model:ir.model.fields,help:mail.field_res_users__alias_contact
 msgid ""
 "Policy to post a message on the document using the mailgateway.\n"
 "- everyone: everyone can post\n"
@@ -4175,12 +4027,13 @@ msgstr ""
 "- takipçiler: sadece ilgili doküman veya konunun takipçileri\n"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Powered by"
 msgstr "Hazırlayan"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_previous_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__previous_type_ids
 msgid "Preceding Activities"
 msgstr "Önceki Aktiviteler"
 
@@ -4190,8 +4043,8 @@ msgid "Preferred reply address"
 msgstr "Tercih cevap adresi"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,help:mail.field_mail_template_reply_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,help:mail.field_mail_template__reply_to
 msgid "Preferred response address (placeholders may be used here)"
 msgstr "Yeğlenen yanıtlama adresi (burada yertutucular kullanılır)"
 
@@ -4206,27 +4059,27 @@ msgid "Preview of"
 msgstr "Bunun önizlemesi"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_previous_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__previous_activity_type_id
 msgid "Previous Activity Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_public
+#: model:ir.model.fields,field_description:mail.field_mail_channel__public
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Privacy"
 msgstr "Özel"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:56
-#: code:addons/mail/static/src/xml/client_action.xml:176
+#: code:addons/mail/static/src/xml/discuss.xml:56
+#: code:addons/mail/static/src/xml/discuss.xml:176
 #, python-format
 msgid "Private Channels"
 msgstr "Özel Kanallar"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:848
+#: code:addons/mail/static/src/js/discuss.js:863
 #, python-format
 msgid "Public Channels"
 msgstr "Genel Kanallar"
@@ -4255,68 +4108,72 @@ msgid "Received"
 msgstr "Alınan"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_id
 msgid "Recipient"
 msgstr "Alıcı"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Recipients"
 msgstr "Alıcılar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_recommended_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__recommended_activity_type_id
 msgid "Recommended Activity Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_next_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__next_type_ids
 msgid "Recommended Next Activities"
 msgstr "Önerilen Bir Sonraki Etkinlikler"
 
 #. module: mail
-#: 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_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
 msgid "Record Thread ID"
 msgstr "Konu Kayıt ID"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_references
+#: model:ir.model.fields,field_description:mail.field_mail_mail__references
 msgid "References"
 msgstr "Referanslar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_res_id
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Regards,"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__res_id
 msgid "Related Document ID"
 msgstr "İlgili Döküman ID"
 
 #. 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_mail_model
-#: model:ir.model.fields,field_description:mail.field_mail_message_model
-#: model:ir.model.fields,field_description:mail.field_mail_template_model
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_model
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_model
+#: 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_compose_message__model
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_model
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__model
 msgid "Related Document Model"
 msgstr "İlgili Döküman Modeli"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_model
 msgid "Related Document Model Name"
 msgstr ""
 
@@ -4326,12 +4183,12 @@ msgid "Related Message"
 msgstr "İlişkili Mesaj"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__partner_id
 msgid "Related Partner"
 msgstr "İlişkili İş Ortağı"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__relation_field
 msgid "Relation field"
 msgstr "İlişkili alanı"
 
@@ -4349,17 +4206,17 @@ msgstr "Bu takipçiyi kaldır"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:203
+#: code:addons/mail/static/src/xml/thread.xml:208
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Reply"
 msgstr "Cevapla"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,help:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,help:mail.field_mail_message_reply_to
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,help:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,help:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,help:mail.field_mail_message__reply_to
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__reply_to
 msgid ""
 "Reply email address. Setting the reply_to bypasses the automatic thread "
 "creation."
@@ -4368,46 +4225,46 @@ msgstr ""
 "atlar."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_reply_to
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__reply_to
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__reply_to
 msgid "Reply-To"
 msgstr "Yanıtlama"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_name
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_name
 msgid "Report Filename"
 msgstr "Çıktı Dosyası Adı"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_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 "Sorumlu"
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_user_id
+msgid "Responsible User"
+msgstr "Sorumlu Kullanıcı"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
@@ -4416,12 +4273,12 @@ msgid "Retry"
 msgstr "Yinele"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body_html
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body_html
 msgid "Rich-text Contents"
 msgstr "Zengin-metin İçerik"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_body_html
+#: model:ir.model.fields,help:mail.field_mail_mail__body_html
 msgid "Rich-text/HTML message"
 msgstr "Zengin-metin/HTML mesajı"
 
@@ -4431,7 +4288,7 @@ msgid "SMTP Server"
 msgstr "SMTP Sunucusu"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_res_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__res_id
 msgid "Sample Document"
 msgstr "Örnek Belge"
 
@@ -4465,26 +4322,26 @@ msgid "Schedule activity"
 msgstr "Aktivite Planla"
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:250
+#: code:addons/mail/models/mail_activity.py:260
 #, python-format
 msgid "Schedule an Activity"
 msgstr "Etkinlik Planla"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:57
 #, python-format
 msgid "Schedule an activity"
 msgstr "Aktivite Planla"
 
 #. 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
+#: 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"
 msgstr "Planlanan Tarih"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__scheduled_date
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Scheduled Send Date"
 msgstr "Planlanmış Gönderi Tarihi"
@@ -4500,8 +4357,8 @@ msgid "Search Groups"
 msgstr "Grupları Ara"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__model_object_field
 msgid ""
 "Select target field from the related document model.\n"
 "If it is a relationship field you will be able to select a target field at the destination of the relationship."
@@ -4516,19 +4373,19 @@ msgstr "Seçilen kullanıcı grubu"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:374
+#: code:addons/mail/static/src/js/composer.js:428
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Send"
 msgstr "Gönder"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail
 msgid "Send Email"
 msgstr "Eposta Gönder"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:264
+#: code:addons/mail/models/mail_template.py:295
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "İletiyi Gönder (%s)"
@@ -4554,13 +4411,13 @@ msgid "Send message"
 msgstr "Mesaj Gönder"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
+#: model:ir.model.fields,field_description:mail.field_mail_channel__email_send
 msgid "Send messages by email"
 msgstr "E-posta ile mesaj gönder"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_from
-#: model:ir.model.fields,help:mail.field_mail_template_email_from
+#: model:ir.model.fields,help:mail.field_email_template_preview__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 "
 "value will be the author's email alias if configured, or email address."
@@ -4571,14 +4428,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Sending Error"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:108
+#: code:addons/mail/static/src/xml/discuss.xml:108
 #, python-format
 msgid "Sends messages by email"
 msgstr "E-posta ile mesaj gönder"
@@ -4590,25 +4447,30 @@ msgid "Sent"
 msgstr "Gönderilmiş"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_email
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "Sent by"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_email
 msgid "Sent by Email"
 msgstr "Epostayla Gönder"
 
 #. 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
+#: 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 "Sıra"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Settings"
 msgstr "Ayarlar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__shortcode_type
 msgid "Shortcode Type"
 msgstr ""
 
@@ -4619,7 +4481,7 @@ msgid "Shortcodes"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__source
 msgid "Shortcut"
 msgstr "Kısayol"
 
@@ -4630,20 +4492,20 @@ msgid "Show all records which has next action date is before today"
 msgstr "Bir sonraki eylem tarihi bugünden önce olan tüm kayıtları göster"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:667
+#: code:addons/mail/models/mail_channel.py:673
 #, python-format
 msgid "Show an helper message"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,field_description:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_mail_template__ref_ir_act_window
 msgid "Sidebar action"
 msgstr "Kenar Çubuğu işlemi"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,help:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_mail_template__ref_ir_act_window
 msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
@@ -4651,10 +4513,10 @@ msgstr ""
 "Kenar çubuğu bu şablonun ilgili belge modellerinde kullanılmasını sağlar"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_avatar
 msgid ""
 "Small-sized image of this contact. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4665,12 +4527,12 @@ msgstr ""
 "kullanabilirsiniz."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_small
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_small
 msgid "Small-sized photo"
 msgstr "Küçük boyutlu fotoğraf"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_small
+#: model:ir.model.fields,help:mail.field_mail_channel__image_small
 msgid ""
 "Small-sized photo of the group. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4685,7 +4547,7 @@ msgid "Smiley"
 msgstr "Gülümseyen"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_res_model_id
+#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_id
 msgid ""
 "Specify a model if the activity should be specific to a model and not "
 "available when managing activities for other models."
@@ -4693,74 +4555,52 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:661
-#: code:addons/mail/static/src/xml/client_action.xml:28
-#: code:addons/mail/static/src/xml/client_action.xml:156
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred
+#: code:addons/mail/static/src/js/services/chat_manager.js:89
+#: code:addons/mail/static/src/xml/discuss.xml:28
+#: code:addons/mail/static/src/xml/discuss.xml:156
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred
 #, python-format
 msgid "Starred"
 msgstr "Yıldızlı"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_state
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_state
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_mail_activity__state
 msgid "State"
 msgstr "Durumu"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_state
+#: 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
 msgid "Status"
 msgstr "Durum"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,help:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,help:mail.field_event_track_activity_state
-#: model:ir.model.fields,help:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,help:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,help:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,help:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,help:mail.field_product_template_activity_state
-#: model:ir.model.fields,help:mail.field_project_task_activity_state
-#: model:ir.model.fields,help:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,help:mail.field_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
+#: model:ir.model.fields,help:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,help:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,help:mail.field_event_track__activity_state
+#: model:ir.model.fields,help:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,help:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,help:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,help:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,help:mail.field_note_note__activity_state
+#: model:ir.model.fields,help:mail.field_product_product__activity_state
+#: model:ir.model.fields,help:mail.field_product_template__activity_state
+#: model:ir.model.fields,help:mail.field_project_task__activity_state
+#: model:ir.model.fields,help:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,help:mail.field_repair_order__activity_state
+#: model:ir.model.fields,help:mail.field_res_partner__activity_state
+#: model:ir.model.fields,help:mail.field_res_users__activity_state
+#: model:ir.model.fields,help:mail.field_sale_order__activity_state
+#: model:ir.model.fields,help:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,help:mail.field_survey_survey__activity_state
 msgid ""
 "Status based on activities\n"
 "Overdue: Due date is already passed\n"
@@ -4769,33 +4609,33 @@ msgid ""
 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
+#: 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"
 msgstr "Alt-alan"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,field_description:mail.field_mail_template_sub_object
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,field_description:mail.field_mail_template__sub_object
 msgid "Sub-model"
 msgstr "Alt-model"
 
 #. module: mail
 #. 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_mail_compose_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_mail_subject
-#: model:ir.model.fields,field_description:mail.field_mail_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_template_subject
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subject
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__subject
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_mail__subject
+#: model:ir.model.fields,field_description:mail.field_mail_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_template__subject
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subject
 #, python-format
 msgid "Subject"
 msgstr "Konu"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_subject
-#: model:ir.model.fields,help:mail.field_mail_template_subject
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr "Konu (burada yer tutucular kullanılabilir)"
@@ -4807,22 +4647,22 @@ msgstr "Konu..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:216
+#: code:addons/mail/static/src/xml/thread.xml:221
 #, python-format
 msgid "Subject:"
 msgstr "Konu:"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_substitution
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__substitution
 msgid "Substitution"
 msgstr "Değişiklik"
 
 #. module: mail
-#: 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_1993
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subtype_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subtype_id
 #: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
 msgid "Subtype"
 msgstr "Alt-Tür"
@@ -4834,8 +4674,8 @@ msgid "Subtypes"
 msgstr "Alt-Türler"
 
 #. 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
+#: 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 "Özet"
 
@@ -4847,7 +4687,7 @@ msgid "System notification"
 msgstr "Sistem bildirimi"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,help:mail.field_mail_activity__has_recommended_activities
 msgid "Technical field for UX purpose"
 msgstr ""
 
@@ -4857,6 +4697,14 @@ msgid "Template Preview"
 msgstr "Şablon Önizleme"
 
 #. module: mail
+#: code:addons/mail/models/mail_template.py:264
+#, python-format
+msgid ""
+"Template rendering failed, this could mean that your template contains "
+"python syntax errors"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_template_tree_all
 #: model:ir.ui.menu,name:mail.menu_email_templates
 #: model:ir.ui.view,arch_db:mail.email_template_form
@@ -4866,14 +4714,24 @@ msgid "Templates"
 msgstr "Şablonlar"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The"
+msgstr "Bu"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The email sent to"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_shortcode__substitution
 msgid "The escaped html code replacing the shortcut"
 msgstr ""
 
 #. module: mail
-#: 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_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
 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 "
@@ -4884,9 +4742,9 @@ msgstr ""
 "görevini) yeni kayıt oluşturma"
 
 #. module: mail
-#: 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_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
 msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
@@ -4895,9 +4753,9 @@ msgstr ""
 "tanım olacak."
 
 #. module: mail
-#: 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_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
 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 "
@@ -4910,9 +4768,9 @@ msgstr ""
 "Administratörü kullanacaktır."
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:165
-#: code:addons/mail/models/mail_message.py:579
-#: code:addons/mail/models/mail_message.py:674
+#: code:addons/mail/models/mail_activity.py:175
+#: code:addons/mail/models/mail_message.py:578
+#: code:addons/mail/models/mail_message.py:678
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -4924,18 +4782,18 @@ msgstr ""
 "(Belge tipi: %s, İşlem: %s)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__source
 msgid "The shortcut which must be replaced in the Chat Messages"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__unicode_source
 msgid "The source is replaced by this unicode character in the Chat Messages"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,help:mail.field_mail_template_model_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,help:mail.field_mail_template__model_id
 msgid "The type of document this template can be used with"
 msgstr "Bu şablon ile birlikte kullanılabilen belge türünü"
 
@@ -4945,7 +4803,7 @@ msgid "This"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image
+#: model:ir.model.fields,help:mail.field_mail_channel__image
 msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
@@ -4953,7 +4811,7 @@ msgstr ""
 "Bu alan, grup için kullanılan resmi tutar, 1024x1024px olarak sınırlıdır."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_public
+#: model:ir.model.fields,help:mail.field_mail_channel__public
 msgid ""
 "This group is visible by non members. Invisible groups can add members "
 "through the invite button."
@@ -4965,20 +4823,20 @@ msgid "Thread"
 msgstr "Konu"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_to
 msgid "To"
 msgstr "Alıcı"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_to
 msgid "To (Emails)"
 msgstr "Kime (Epostalar)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_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
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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)"
 msgstr "Kime (İş Ortakları)"
 
@@ -4993,8 +4851,8 @@ msgstr "Kime:"
 #. module: mail
 #. openerp-web
 #: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:25
-#: code:addons/mail/static/src/js/thread.js:242
+#: code:addons/mail/static/src/js/activity.js:82
+#: code:addons/mail/static/src/js/thread.js:328
 #: code:addons/mail/static/src/xml/systray.xml:75
 #: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
 #: selection:hr.applicant,activity_state:0
@@ -5004,12 +4862,12 @@ msgstr "Kime:"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -5031,7 +4889,7 @@ msgstr "Yapma"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:35
+#: code:addons/mail/static/src/js/activity.js:92
 #, python-format
 msgid "Tomorrow"
 msgstr "Yarın"
@@ -5042,17 +4900,17 @@ msgid "Topics discussed in this group..."
 msgstr "Bu grupta tartışılan başlıklar..."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid ""
 "Tracked values are stored in a separate model. This field allow to "
 "reconstruct the tracking and to generate statistics on the model."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,field_description:mail.field_ir_model_fields__track_visibility
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Tracking"
 msgstr "İzleme"
@@ -5070,28 +4928,28 @@ msgid "Tracking Values"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid "Tracking values"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_type
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_type
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_type
 msgid "Type"
 msgstr "Tür"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_uuid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__uuid
 msgid "UUID"
 msgstr "UUID"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:235
+#: code:addons/mail/models/mail_mail.py:233
 #, python-format
 msgid "Unable to connect to SMTP Server"
 msgstr ""
@@ -5104,7 +4962,6 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:700
 #: code:addons/mail/static/src/xml/followers.xml:22
 #, python-format
 msgid "Unfollow"
@@ -5119,143 +4976,145 @@ msgstr ""
 "seçin"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__unicode_source
 msgid "Unicode Character"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread
 msgid "Unread Messages"
 msgstr "Okunmamış Mesajlar"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread_counter
 msgid "Unread Messages Counter"
 msgstr "Okunmamış Mesaj Sayacı"
 
@@ -5266,61 +5125,61 @@ msgstr "Okunmamış mesajlar"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all"
 msgstr "Tüm Yıldızları Kaldır"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all messages"
 msgstr "Tüm Yıldızları Kaldır"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe"
 msgstr "Üyelikten Çık"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe from channel"
 msgstr "Kanal aboneliğinden çık"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:510
+#: code:addons/mail/models/mail_template.py:504
 #, python-format
 msgid "Unsupported report type %s found."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:322
+#: code:addons/mail/static/src/xml/thread.xml:327
 #, python-format
 msgid "Uploading"
 msgstr "Yükleniyor"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Uploading error"
 msgstr "Yükleme hatası"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_use_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_use_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__use_active_domain
 msgid "Use active domain"
 msgstr "Kullanımı etkin etki alanı"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_template_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_template_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__template_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__template_id
 msgid "Use template"
 msgstr "Şablonu Kullan"
 
@@ -5330,7 +5189,7 @@ msgid "Use your own email servers"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_sequence
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__sequence
 msgid "Used to order subtypes."
 msgstr "Alt-Türler"
 
@@ -5343,7 +5202,7 @@ msgstr "Kullanıcı"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:51
+#: code:addons/mail/static/src/xml/discuss.xml:51
 #: code:addons/mail/static/src/xml/extended_chat_window.xml:8
 #, python-format
 msgid "User name"
@@ -5355,7 +5214,7 @@ msgid "Users"
 msgstr "Kullanıcılar"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:711
+#: code:addons/mail/models/mail_channel.py:717
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5369,14 +5228,14 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:670
+#: code:addons/mail/models/mail_thread.py:696
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 #, python-format
 msgid "View"
 msgstr "Göster"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:668
+#: code:addons/mail/models/mail_thread.py:694
 #, python-format
 msgid "View %s"
 msgstr ""
@@ -5395,8 +5254,8 @@ msgstr ""
 "Bu takipçiyi gerçekten kaldırmak istiyor musunuz?"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_sub_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__sub_model_object_field
 msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
@@ -5405,8 +5264,8 @@ msgstr ""
 " hedef alanını seçmenizi sağlar."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,help:mail.field_mail_template_sub_object
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,help:mail.field_mail_template__sub_object
 msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
@@ -5415,20 +5274,20 @@ msgstr ""
 "belge modelini gösterir."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,help:mail.field_ir_model_fields__track_visibility
 msgid ""
 "When set, every modification to this field will be tracked in the chatter."
 msgstr ""
 "Ayarlandığında, bu alandaki çok değişiklikler sohbetçide izlenecektir."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_is_log
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_is_log
+#: model:ir.model.fields,help:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__is_log
 msgid "Whether the message is an internal note (comment mode only)"
 msgstr "Mesaj bir iç notu olsun (comment modu)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,help:mail.field_ir_model__is_mail_thread
 msgid "Whether this model supports messages and notifications."
 msgstr "Bu modelin ileti ve bildirimleri destekleyip desteklemediğidir."
 
@@ -5446,47 +5305,47 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:12
+#: code:addons/mail/static/src/xml/composer.xml:11
 #, python-format
-msgid "Write something..."
+msgid "Write Something..."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:29
-#: code:addons/mail/static/src/js/thread.js:244
+#: code:addons/mail/static/src/js/activity.js:86
+#: code:addons/mail/static/src/js/thread.js:330
 #, python-format
 msgid "Yesterday"
 msgstr "Dün"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:96
+#: code:addons/mail/static/src/js/discuss.js:98
 #, python-format
 msgid "You added <b>%s</b> to the conversation."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:708
+#: code:addons/mail/models/mail_channel.py:714
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Bu kanalda yalnızsın."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:677
+#: code:addons/mail/models/mail_channel.py:683
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "<b>@%s</b> ile özel sohbettesiniz."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:672
+#: code:addons/mail/models/mail_channel.py:678
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "<b>#%s</b> kanalındasınız."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:114
+#: code:addons/mail/static/src/xml/thread.xml:119
 #, python-format
 msgid ""
 "You can mark any message as 'starred', and it shows up in this channel."
@@ -5495,7 +5354,7 @@ msgstr ""
 "gösterilir."
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:54
+#: code:addons/mail/models/res_users.py:53
 #, python-format
 msgid ""
 "You cannot create a new user from here.\n"
@@ -5515,11 +5374,10 @@ msgstr ""
 "silinemez."
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:349
+#: code:addons/mail/models/mail_thread.py:342
 #, python-format
 msgid ""
-"You could also add a new %(document)s by sending an email to: "
-"%(email_link)s."
+"You could also add a new %(document)s by sending an email to %(email_link)s"
 msgstr ""
 
 #. module: mail
@@ -5529,14 +5387,14 @@ msgstr "Size atanan"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "You have been invited to: "
 msgstr "Davet edildiniz:"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,help:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_template__attachment_ids
 msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
@@ -5546,28 +5404,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:473
+#: code:addons/mail/static/src/js/services/chat_manager.js:1536
 #, 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:471
+#: code:addons/mail/static/src/js/services/chat_manager.js:1534
 #, python-format
 msgid "You unsubscribed from <b>%s</b>."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:217
+#: code:addons/mail/static/src/xml/discuss.xml:217
 #, python-format
 msgid "You:"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Your message has not been sent."
 msgstr ""
@@ -5579,23 +5437,35 @@ msgid "Your template should define email_from"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "alias %s: %s"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
+msgid "base.partner.merge.automatic.wizard"
+msgstr "base.partner.merge.automatic.wizard"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "by"
 msgstr "Talebi karşılayan: "
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid ""
+"cannot be processed. This address\n"
+"    is used to collect replies and should not be used to directly contact"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "oluşturuldu"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:315
+#: code:addons/mail/models/mail_thread.py:309
 #, python-format
 msgid "document"
 msgstr "belge"
@@ -5614,7 +5484,7 @@ msgstr "ör. Teklifi tartış"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "enable desktop notifications"
 msgstr "Masaüstü bildirimlerini etkinleştir"
@@ -5649,13 +5519,13 @@ msgid "has been"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:282
+#: code:addons/mail/models/mail_alias.py:271
 #, python-format
 msgid "incorrectly configured alias"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:278
+#: code:addons/mail/models/mail_alias.py:267
 #, python-format
 msgid "incorrectly configured alias (unknown reference record)"
 msgstr ""
@@ -5676,19 +5546,19 @@ msgid "mail.alias.mixin"
 msgstr "posta.takmaad.karışmak"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:943
+#: code:addons/mail/models/mail_thread.py:925
 #, python-format
 msgid "model %s does not accept document creation"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:938
+#: code:addons/mail/models/mail_thread.py:920
 #, python-format
 msgid "model %s does not accept document update"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:931
+#: code:addons/mail/models/mail_thread.py:913
 #, python-format
 msgid ""
 "model %s does not accept document update, fall back on document creation"
@@ -5713,14 +5583,14 @@ msgstr "şimdi"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:177
+#: code:addons/mail/static/src/xml/thread.xml:181
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "on"
 msgstr "açık"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid ""
 "posting a message without model should be with a null res_id (private "
@@ -5728,7 +5598,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:917
+#: code:addons/mail/models/mail_thread.py:899
 #, python-format
 msgid ""
 "posting a message without model should be with a parent_id (private message)"
@@ -5759,13 +5629,13 @@ msgid "record:"
 msgstr "kayıt:"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:935
+#: code:addons/mail/models/mail_thread.py:917
 #, python-format
 msgid "reply to missing document (%s,%s)"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:928
+#: code:addons/mail/models/mail_thread.py:910
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
 msgstr ""
@@ -5776,40 +5646,45 @@ msgid "res.config.settings"
 msgstr "res.config.settings"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid "resetting thread_id"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:254
+#: code:addons/mail/models/mail_channel.py:252
 #, python-format
 msgid "restricted to channel members"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:287
+#: code:addons/mail/models/mail_alias.py:276
 #, python-format
 msgid "restricted to followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:291
+#: code:addons/mail/models/mail_alias.py:280
 #, python-format
 msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:899
 #: code:addons/mail/models/mail_thread.py:917
-#: code:addons/mail/models/mail_thread.py:935
-#: code:addons/mail/models/mail_thread.py:938
-#: code:addons/mail/models/mail_thread.py:943
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:920
+#: code:addons/mail/models/mail_thread.py:925
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "skipping"
 msgstr "atlama"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "team."
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:20
 #, python-format
@@ -5817,13 +5692,18 @@ msgid "this document"
 msgstr "bu belgede"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "unknown error"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:906
+#: code:addons/mail/models/mail_thread.py:888
 #, python-format
 msgid "unknown target model %s"
 msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "using"
+msgstr ""
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 416f31bcffc..67d4bf58f81 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.po
@@ -5,10 +5,10 @@
 # Translators:
 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # 苏州远鼎 <tiexinliu@126.com>, 2016
-# liAnGjiA <liangjia@qq.com>, 2017
 # liulixia <liu.lixia@elico-corp.com>, 2017
 # waveyeung <waveyeung@qq.com>, 2017
 # Martin Trigaux, 2017
+# liAnGjiA <liangjia@qq.com>, 2017
 # Rona Lin <ssauapw@qq.com>, 2017
 # xiaobin wu <bd5dml@gmail.com>, 2017
 # Michael Chong <michaelchong2005@gmail.com>, 2017
@@ -16,15 +16,15 @@
 # Talway <9010446@qq.com>, 2017
 # 卓忆科技 <zhanghao@jointd.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
-# ShiGang Chen <jjfxb@live.cn>, 2017
 # e2f <projects@e2f.com>, 2018
+# e2f_cn c7 <e2f_cn_c7@outlook.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.1\n"
+"Project-Id-Version: Odoo Server saas~11.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-13 14:36+0000\n"
-"PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: e2f <projects@e2f.com>, 2018\n"
+"POT-Creation-Date: 2018-03-22 14:10+0000\n"
+"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"Last-Translator: e2f_cn c7 <e2f_cn_c7@outlook.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,166 +33,59 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_data_notification_email_default
-msgid ""
-"\n"
-"% set company = ctx.get('company', user.company_id)\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"
-"        <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-"        <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
-"    </div>\n"
-"</div>\n"
-"% endif\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('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('has_button_follow'):\n"
-"        % if ctx.get('has_button_access'):\n"
-"           |\n"
-"        % endif\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=\"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=\"color: #875A7B; text-decoration:none !important;\">${action['title']}</a>\n"
-"        % endfor\n"
-"        % endif\n"
-"    </td>\n"
-"    <td valign=\"center\" align=\"right\">\n"
-"        <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\">\n"
-"    </td>\n"
-"</tr>\n"
-"<tr>\n"
-"    <td colspan=\"2\" style=\"text-align:center;\">\n"
-"        <hr width=\"100%\"\n"
-"            style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
-"        % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
-"        <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n"
-"            <strong>Internal communication</strong>: Replying will post an internal note. Followers won't receive any email notification.\n"
-"        </p>\n"
-"        % endif\n"
-"    </td>\n"
-"</tr>\n"
-"</tbody></table>\n"
-"</div>\n"
-"% endif\n"
-"<div>\n"
-"    ${object.body | safe}\n"
-"</div>\n"
-"% if ctx.get('tracking'):\n"
-"    <ul>\n"
-"    % for tracking in ctx['tracking']\n"
-"        <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
-"    % endfor\n"
-"    </ul>\n"
-"% endif\n"
-"\n"
-"% if ctx.get('signature'):\n"
-"    ${ctx['signature'] | safe}\n"
-"% endif\n"
-"<br/>\n"
-"<p style=\"color: #555555;\">\n"
-"    Sent by\n"
-"    % if ctx.get('website_url'):\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 target=\"_blank\" href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\">Odoo</a>.\n"
-"</p>\n"
-"</div>"
-msgstr ""
-"<div><div itemscope itemtype=\"http://schema.org/EmailMessage\"><div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\"><link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/><link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/><meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/></div></div><div summary=\"o_mail_notification\" style=\"padding: 0px; width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"width: 600px; margin-top: 5px;\"><tbody><tr><td valign=\"center\"><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\"></a><a href=\"${ctx['button_follow']['url']}\" style=\"color: #875A7B; text-decoration: none !important;\"></a><a href=\"${ctx['button_unfollow']['url']}\" style=\"color: #875A7B; text-decoration: none !important;\"></a><a href=\"${action['url']}\" style=\"color: #875A7B; text-decoration:none !important;\"></a></td><td valign=\"center\" align=\"right\"><img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\"></td></tr><tr><td colspan=\"2\" style=\"text-align:center;\"><hr width=\"100%\"\n"
-" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\"><p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\"><strong></strong></p></td></tr></tbody></table></div><div></div><ul><li></li></ul><br/><p style=\"color: #555555;\"><a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #875A7B;\"></a><a target=\"_blank\" href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\"></a></p></div>"
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:674
+#: code:addons/mail/models/mail_channel.py:680
 #, 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) "
-"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
-"object.parent_id.subject) or (object.parent_id and "
-"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
-msgstr ""
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:63
+#: code:addons/mail/static/src/js/services/chat_manager.js:1634
 #, python-format
 msgid "%d Messages"
 msgstr "%d 消息"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:31
+#: code:addons/mail/static/src/js/activity.js:88
 #, python-format
 msgid "%d days overdue"
 msgstr "%d 天超期"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:248
+#: code:addons/mail/models/mail_template.py:279
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:236
+#: code:addons/mail/models/mail_thread.py:234
 #, python-format
 msgid "%s created"
 msgstr "%s 创建"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:81
+#: code:addons/mail/models/res_users.py:80
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s 加入到 %s 网络."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:211
 #, python-format
 msgid "&nbsp;("
 msgstr "&nbsp;("
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:179
+#: code:addons/mail/static/src/xml/thread.xml:184
 #, python-format
 msgid "(from"
 msgstr "(从"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,help:mail.field_mail_shortcode__shortcode_type
 msgid ""
 "* Smiley are only used for HTML code to display an image * Text (default "
 "value) is used to substitute text with another text"
@@ -207,7 +100,7 @@ msgstr "，应提交"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:331
+#: code:addons/mail/static/src/xml/thread.xml:336
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr "-------- 显示更多消息 --------"
@@ -234,7 +127,7 @@ msgid "0 Today"
 msgstr "0 今天"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:684
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -245,7 +138,16 @@ msgid ""
 msgstr "<br><br><b></b><br><b></b><br><b></b><br><b></b><br>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:584
+#: code:addons/mail/models/mail_channel.py:507
+#, python-format
+msgid ""
+"<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
+"href=\"#\" class=\"o_channel_redirect\" data-oe-"
+"id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:590
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -255,8 +157,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:508
-#: code:addons/mail/models/mail_channel.py:561
+#: code:addons/mail/models/mail_channel.py:514
+#: code:addons/mail/models/mail_channel.py:567
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -368,6 +270,11 @@ msgstr ""
 "<span class=\"o_stat_text\">上下文动作</span>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+msgid "<span class=\"oe_inline\">days</span>"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>\n"
@@ -384,6 +291,13 @@ msgid "<strong> Feedback</strong>"
 msgstr "<strong> 反馈</strong>"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid ""
+"<strong>Internal communication</strong>: Replying will post an internal "
+"note. Followers won't receive any email notification."
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<strong>Only records checked in list view will be used.</strong><br/>\n"
@@ -396,9 +310,9 @@ msgid "<strong>Recommended Activities</strong>"
 msgstr "<strong>推荐的活动</strong>"
 
 #. 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_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
 msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
@@ -417,115 +331,118 @@ msgid "Access Groups"
 msgstr "访问用户群组"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction
 msgid "Action Needed"
 msgstr "需要行动"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__default
 msgid "Activated by default when subscribing."
 msgstr "订阅时默认激活"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__active
 #: model:ir.ui.view,arch_db:mail.view_mail_alias_search
 msgid "Active"
 msgstr "有效"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__active_domain
 msgid "Active domain"
 msgstr "有效域"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/systray.xml:87
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_ids
-#: model:ir.model.fields,field_description:mail.field_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.model.fields,field_description:mail.field_account_invoice__activity_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_ids
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
 #: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 #: model:mail.message.subtype,name:mail.mt_activities
@@ -537,7 +454,7 @@ msgstr "活动"
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:60
 #: model:ir.model,name:mail.model_mail_activity
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_type_id
+#: 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
@@ -551,6 +468,32 @@ msgid "Activity Mixin"
 msgstr "活动Mixin"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_state
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_state
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_state
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_state
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_state
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_state
+msgid "Activity State"
+msgstr "活动状态"
+
+#. 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"
@@ -572,7 +515,7 @@ msgstr "活动类型"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:87
+#: code:addons/mail/static/src/xml/discuss.xml:87
 #, python-format
 msgid "Add"
 msgstr "添加"
@@ -580,7 +523,7 @@ msgstr "添加"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:64
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_channel_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__channel_ids
 #, python-format
 msgid "Add Channels"
 msgstr "添加频道"
@@ -588,7 +531,7 @@ msgstr "添加频道"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/followers.xml:61
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_partner_ids
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
 msgid "Add Followers"
@@ -601,22 +544,28 @@ msgid "Add Followers can only be done on a mail thread model"
 msgstr "仅在邮件线程模型上可以添加关注者"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,field_description:mail.field_mail_template_user_signature
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,field_description:mail.field_mail_template__user_signature
 msgid "Add Signature"
 msgstr "添加签名"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:41
-#: code:addons/mail/static/src/xml/client_action.xml:186
+#: code:addons/mail/static/src/xml/discuss.xml:41
+#: code:addons/mail/static/src/xml/discuss.xml:186
 #, python-format
 msgid "Add a channel"
 msgstr "添加频道"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:335
+#, python-format
+msgid "Add a new %(document)s or send an email to %(email_link)s"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:60
+#: code:addons/mail/static/src/xml/discuss.xml:60
 #, python-format
 msgid "Add a private channel"
 msgstr "添加私人频道"
@@ -633,7 +582,7 @@ msgid "Add contacts to notify..."
 msgstr "添加联系人到通知中  ..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
 msgid "Additional Contacts"
 msgstr "额外的联系人"
 
@@ -648,45 +597,45 @@ msgid "Advanced Settings"
 msgstr "高级设置"
 
 #. 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_res_users_alias_id
+#: 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_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
 msgid "Alias"
 msgstr "别名"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_contact
+#: 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
+#: model:ir.model.fields,field_description:mail.field_res_users__alias_contact
 msgid "Alias Contact Security"
 msgstr "别名联系人安全"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__alias_domain
 msgid "Alias Domain"
 msgstr "别名域"
 
 #. module: mail
-#: 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_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
 msgid "Alias Name"
 msgstr "别名"
 
 #. module: mail
-#: 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_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
 msgid "Alias domain"
 msgstr "别名网域"
 
 #. module: mail
-#: 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_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
 msgid "Aliased Model"
 msgstr "别名的模型"
 
@@ -711,24 +660,24 @@ msgstr "总是"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:198
+#: code:addons/mail/static/src/js/services/chat_manager.js:1328
 #, python-format
 msgid "Anonymous"
 msgstr "匿名"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,help:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,help:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__no_auto_thread
 msgid ""
 "Answers do not go in the original document discussion thread. This has an "
 "impact on the generated message-id."
 msgstr "答案不在原来的讨论区中，会对生成的message-id中有影响"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_id
 msgid "Applies to"
 msgstr "应用于"
 
@@ -740,9 +689,14 @@ msgid "Apply"
 msgstr "应用"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+msgid "Archived"
+msgstr "已归档"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:45
-#: model:ir.model.fields,field_description:mail.field_mail_activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
 #, python-format
 msgid "Assigned to"
 msgstr "分派给"
@@ -753,19 +707,19 @@ msgid "Attach a file"
 msgstr "附加一个文件"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_attachment_ids
-#: model:ir.model.fields,field_description:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__attachment_ids
+#: model:ir.model.fields,field_description:mail.field_mail_template__attachment_ids
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Attachments"
 msgstr "附件"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_message_attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_message__attachment_ids
 msgid ""
 "Attachments are linked to a document through model / res_id and to the "
 "message through this field."
@@ -782,10 +736,10 @@ msgid "Authenticated Partners"
 msgstr "身份验证过的业务伙伴"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_id
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Author"
 msgstr "作者"
@@ -796,37 +750,37 @@ msgid "Author Signature (mass mail only)"
 msgstr "作者签名(仅限群发邮件)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_id
-#: model:ir.model.fields,help:mail.field_mail_mail_author_id
-#: model:ir.model.fields,help:mail.field_mail_message_author_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_id
+#: model:ir.model.fields,help:mail.field_mail_mail__author_id
+#: model:ir.model.fields,help:mail.field_mail_message__author_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_id
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that"
 " did not match any partner."
 msgstr "消息的作者。如果没设置，email_from 可能保存一个不匹配任何合作伙伴的 email地址，"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,field_description:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,field_description:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_avatar
 msgid "Author's avatar"
 msgstr "作者头像"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_public_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_public_id
 msgid "Authorized Group"
 msgstr "经授权的群组"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,field_description:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,field_description:mail.field_mail_template__auto_delete
 msgid "Auto Delete"
 msgstr "自动删除"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_ids
 msgid "Auto Subscription"
 msgstr "自动订阅"
 
@@ -848,16 +802,16 @@ msgid "Be careful with channels following internal notifications"
 msgstr "小心内部指示的渠道"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
-#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
 msgid "Body"
 msgstr "正文"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,field_description:mail.field_res_users_message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_users__message_bounce
 msgid "Bounce"
 msgstr "退回"
 
@@ -903,32 +857,32 @@ msgid "Canned Response / Shortcode"
 msgstr "自动回复/短码"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_cc
+#: model:ir.model.fields,help:mail.field_mail_mail__email_cc
 msgid "Carbon copy message recipients"
 msgstr "抄送"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,help:mail.field_mail_template_email_cc
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,help:mail.field_mail_template__email_cc
 msgid "Carbon copy recipients (placeholders may be used here)"
 msgstr "抄送收件人（可以在这里使用占位符）"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,help:mail.field_mail_activity_type_category
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,help:mail.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
 msgstr "类别可能触发特定行为，例如，打开日历视图"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_category
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__category
 msgid "Category"
 msgstr "类别"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_cc
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_cc
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_cc
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_cc
 msgid "Cc"
 msgstr "抄送"
 
@@ -938,40 +892,40 @@ msgid "Change"
 msgstr "更改"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field
 msgid "Changed Field"
 msgstr "更改的字段"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
 #: selection:mail.channel,channel_type:0
 msgid "Channel"
 msgstr "渠道"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids
+#: 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_type
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_type
 msgid "Channel Type"
 msgstr "频道类型"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:36
-#: code:addons/mail/static/src/xml/client_action.xml:172
+#: code:addons/mail/static/src/xml/discuss.xml:36
+#: code:addons/mail/static/src/xml/discuss.xml:172
 #: code:addons/mail/static/src/xml/systray.xml:19
 #: code:addons/mail/static/src/xml/systray.xml:36
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__channel_ids
 #: model:ir.ui.menu,name:mail.mail_channel_menu_settings
 #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
 #, python-format
@@ -986,7 +940,7 @@ msgstr "频道/业务伙伴"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:168
+#: code:addons/mail/static/src/xml/discuss.xml:168
 #: code:addons/mail/static/src/xml/systray.xml:18
 #: code:addons/mail/static/src/xml/systray.xml:32
 #: model:ir.actions.client,name:mail.mail_channel_action_client_chat
@@ -1005,10 +959,10 @@ msgid "Chat Shortcode"
 msgstr "聊天简码"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_child_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_child_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__child_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__child_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__child_ids
 msgid "Child Messages"
 msgstr "下级信息"
 
@@ -1018,23 +972,6 @@ msgid "Choose an example"
 msgstr "选择一个示例"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:342
-#, python-format
-msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
-msgstr "点击此处添加新的%(document)s或者给%(email_link)s发送邮件"
-
-#. module: mail
-#: code:addons/mail/models/mail_thread.py:358
-#, python-format
-msgid "Click here to add new %s"
-msgstr "点击这儿添加新%s"
-
-#. module: mail
-#: model:ir.actions.act_window,help:mail.mail_shortcode_action
-msgid "Click to define a new chat shortcode."
-msgstr "点击定义聊天短码"
-
-#. module: mail
 #: selection:mail.channel.partner,fold_state:0
 msgid "Closed"
 msgstr "已关闭"
@@ -1050,8 +987,8 @@ msgid "Comma-separated ids of recipient partners"
 msgstr "逗号分隔的收件人合作伙伴的ID"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_partner_to
-#: model:ir.model.fields,help:mail.field_mail_template_partner_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr "逗号分隔的收件人合作伙伴的ID（可以使用占位符）"
@@ -1062,8 +999,8 @@ msgid "Comma-separated recipient addresses"
 msgstr "逗号分隔的收件人地址"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,help:mail.field_mail_template_email_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,help:mail.field_mail_template__email_to
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr "逗号分隔的收件人地址（可以在这里使用占位符）"
 
@@ -1082,8 +1019,8 @@ msgid "Compose Email"
 msgstr "撰写邮件"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_composition_mode
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__composition_mode
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__composition_mode
 msgid "Composition mode"
 msgstr "写作模式"
 
@@ -1094,14 +1031,14 @@ msgstr "配置你的活动类型"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:109
+#: code:addons/mail/static/src/xml/thread.xml:114
 #, python-format
 msgid "Congratulations, your inbox is empty"
 msgstr "恭喜，你的收件箱已清空。"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:647
+#: code:addons/mail/static/src/js/discuss.js:662
 #, python-format
 msgid "Congratulations, your inbox is empty!"
 msgstr "恭喜，你的收件箱是空的！"
@@ -1118,20 +1055,20 @@ msgid "Content"
 msgstr "内容"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_body
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body
-#: model:ir.model.fields,field_description:mail.field_mail_message_body
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_body
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__body
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body
+#: model:ir.model.fields,field_description:mail.field_mail_message__body
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__body
 msgid "Contents"
 msgstr "内容"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_fold_state
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__fold_state
 msgid "Conversation Fold State"
 msgstr "对话收拢状态"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_minimized
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_minimized
 msgid "Conversation is minimized"
 msgstr "对话已最小化"
 
@@ -1143,64 +1080,70 @@ msgid "Conversations"
 msgstr "对话"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_message_bounce
-#: model:ir.model.fields,help:mail.field_res_users_message_bounce
+#: model:ir.model.fields,help:mail.field_res_partner__message_bounce
+#: model:ir.model.fields,help:mail.field_res_users__message_bounce
 msgid "Counter of the number of bounced emails for this contact"
 msgstr "此联系人退回邮件数量计数器"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:307
+#: code:addons/mail/static/src/js/discuss.js:318
 #, python-format
 msgid "Create %s"
 msgstr "创建 %s"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__create_date
 msgid "Create Date"
 msgstr "创建日期"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:350
+#, python-format
+msgid "Create a new %(document)s"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Created By"
 msgstr "创建人"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_uid
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_uid
 msgid "Created by"
 msgstr "创建人"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:41
-#: 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
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_template_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_date
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_date
 #, python-format
 msgid "Created on"
 msgstr "创建时间"
@@ -1211,90 +1154,22 @@ msgid "Creation Month"
 msgstr "创建月份"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,help:mail.field_mail_mail_starred
-#: model:ir.model.fields,help:mail.field_mail_message_starred
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_starred
+#: model:ir.model.fields,help:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,help:mail.field_mail_mail__starred
+#: model:ir.model.fields,help:mail.field_mail_message__starred
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__starred
 msgid "Current user has a starred notification linked to this message"
 msgstr "当前用户用 星号 提醒关联到这条消息"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_date
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__date
+#: model:ir.model.fields,field_description:mail.field_mail_message__date
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__date
 msgid "Date"
 msgstr "日期"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,help:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,help:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,help:mail.field_event_event_message_last_post
-#: model:ir.model.fields,help:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,help:mail.field_event_track_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,help:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_track_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
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,help:mail.field_note_note_message_last_post
-#: model:ir.model.fields,help:mail.field_product_product_message_last_post
-#: model:ir.model.fields,help:mail.field_product_template_message_last_post
-#: model:ir.model.fields,help:mail.field_project_project_message_last_post
-#: model:ir.model.fields,help:mail.field_project_task_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,help:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,help:mail.field_res_users_message_last_post
-#: model:ir.model.fields,help:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,help:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,help:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr "发布到记录上的最后消息的日期"
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Deadline"
 msgstr "截止日期"
@@ -1305,32 +1180,32 @@ msgid "Dear"
 msgstr "亲爱的"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__default
 msgid "Default"
 msgstr "默认"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,field_description:mail.field_mail_template_null_value
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,field_description:mail.field_mail_template__null_value
 msgid "Default Value"
 msgstr "默认值"
 
 #. module: mail
-#: 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_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
 msgid "Default Values"
 msgstr "默认值"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__use_default_to
 msgid "Default recipients"
 msgstr "默认收件人"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_use_default_to
-#: model:ir.model.fields,help:mail.field_mail_template_use_default_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__use_default_to
+#: model:ir.model.fields,help:mail.field_mail_template__use_default_to
 msgid ""
 "Default recipients of the record:\n"
 "- partner (using id on a partner or the partner_id field) OR\n"
@@ -1341,26 +1216,31 @@ msgstr ""
 "- 电子邮件(使用发件人或email字段)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.actions.act_window,help:mail.mail_shortcode_action
+msgid "Define a new chat shortcode"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete Emails"
 msgstr "删除邮件"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete_message
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete_message
 msgid "Delete Message Copy"
 msgstr "删除消息副本"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_auto_delete
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_auto_delete
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete
 msgid "Delete sent emails (mass mailing only)"
 msgstr "删除已发送邮件(仅限群发邮件)"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:320
+#: code:addons/mail/static/src/xml/thread.xml:325
 #, python-format
 msgid "Delete this attachment"
 msgstr "删除此附件"
@@ -1371,15 +1251,15 @@ msgid "Delivery Failed"
 msgstr "投递失败"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_description
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_description
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_description
+#: model:ir.model.fields,field_description:mail.field_mail_channel__description
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__description
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__description
 #: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
 msgid "Description"
 msgstr "说明"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_description
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__description
 msgid ""
 "Description that will be added in the message posted for this subtype. If "
 "void, the name will be added instead."
@@ -1387,7 +1267,7 @@ msgstr "将为该子模型的消息添加注解。如为空，则添加名称。
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:46
+#: code:addons/mail/static/src/xml/discuss.xml:46
 #, python-format
 msgid "Direct Messages"
 msgstr "私信"
@@ -1418,26 +1298,26 @@ msgid "Discussions"
 msgstr "讨论"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_activity_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_display_name
-#: 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_display_name
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__display_name
+#: 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_subtype__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_notification__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_thread__display_name
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__display_name
 msgid "Display Name"
 msgstr "显示名称"
 
@@ -1449,13 +1329,13 @@ msgid ""
 msgstr "显示一个关联单据的选项 ，用该模版打开撰写向导"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_res_name
+#: 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
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete_message
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete_message
 msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
@@ -1467,7 +1347,12 @@ msgid "Document Followers"
 msgstr "单据关注者"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_name
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_model_id
+msgid "Document Model"
+msgstr "单据模型"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_name
 msgid "Document Name"
 msgstr "文档名称"
 
@@ -1488,28 +1373,28 @@ msgstr "完成 & 安排下一次"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:296
+#: code:addons/mail/static/src/xml/thread.xml:301
 #, python-format
 msgid "Download this PDF"
 msgstr "下载此PDF"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:272
-#: code:addons/mail/static/src/xml/thread.xml:285
-#: code:addons/mail/static/src/xml/thread.xml:308
+#: code:addons/mail/static/src/xml/thread.xml:277
+#: code:addons/mail/static/src/xml/thread.xml:290
+#: code:addons/mail/static/src/xml/thread.xml:313
 #, python-format
 msgid "Download this attachment"
 msgstr "下载此附件"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity__date_deadline
 msgid "Due Date"
 msgstr "到期时间"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:37
+#: code:addons/mail/static/src/js/activity.js:94
 #, python-format
 msgid "Due in %d days"
 msgstr "截至 %d 天"
@@ -1541,7 +1426,7 @@ msgid "Edit subscription"
 msgstr "编辑订阅"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_email
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_email
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 #: model:mail.activity.type,name:mail.mail_activity_data_email
 #: selection:mail.compose.message,message_type:0
@@ -1576,12 +1461,12 @@ msgid "Email Search"
 msgstr "Email搜索"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_email_status
+#: model:ir.model.fields,field_description:mail.field_mail_notification__email_status
 msgid "Email Status"
 msgstr "Email状态"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__template_id
 msgid "Email Template"
 msgstr "Email模板"
 
@@ -1601,17 +1486,17 @@ msgid "Email Thread"
 msgstr "电子邮件线程"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_alias_id
+#: model:ir.model.fields,help:mail.field_res_users__alias_id
 msgid ""
 "Email address internally associated with this user. Incoming emails will "
 "appear in the user's notifications."
 msgstr "关联这个用户的电子邮件地址，收到的电子邮件被显示在用户的通知中。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_email_from
-#: model:ir.model.fields,help:mail.field_mail_mail_email_from
-#: model:ir.model.fields,help:mail.field_mail_message_email_from
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,help:mail.field_mail_compose_message__email_from
+#: model:ir.model.fields,help:mail.field_mail_mail__email_from
+#: model:ir.model.fields,help:mail.field_mail_message__email_from
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__email_from
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found and replaces the author_id field in the chatter."
@@ -1647,7 +1532,7 @@ msgid "Error during communication with the publisher warranty server."
 msgstr "当与保障服务器通信时发生错误。"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:302
+#: code:addons/mail/models/mail_mail.py:300
 #, python-format
 msgid ""
 "Error without exception. Probably due do sending an email without computed "
@@ -1686,7 +1571,7 @@ msgid "Extended Filters..."
 msgstr "扩展筛选..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_fail_counter
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__fail_counter
 msgid "Fail Mail"
 msgstr "失败的邮件"
 
@@ -1696,64 +1581,64 @@ msgid "Failed"
 msgstr "失败的"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:374
+#: code:addons/mail/models/mail_template.py:368
 #, python-format
 msgid "Failed to render template %r using values %r"
 msgstr "渲染模板%r 失败 使用数值 %r"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,field_description:mail.field_mail_mail__failure_reason
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Failure Reason"
 msgstr "失败原因"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_failure_reason
+#: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
 msgid ""
 "Failure reason. This is usually the exception thrown by the email server, "
 "stored to ease the debugging of mailing issues."
 msgstr "失败原因。这通常是通过电子邮件服务器抛出的异常，存储以缓解邮件问题的调试。"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred_partner_ids
 msgid "Favorited By"
 msgstr "收藏夹"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:215
-#: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
+#: code:addons/mail/static/src/js/activity.js:245
+#: model:ir.model.fields,field_description:mail.field_mail_activity__feedback
 #, python-format
 msgid "Feedback"
 msgstr "反馈"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,field_description:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,field_description:mail.field_mail_template__model_object_field
 msgid "Field"
 msgstr "字段"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:24
+#: code:addons/mail/models/ir_model.py:30
 #, python-format
 msgid "Field \"Mail Thread\" cannot be changed to \"False\"."
 msgstr "字段“电子邮件线程”不能更改为“假”。"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_desc
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_desc
 msgid "Field Description"
 msgstr "字段说明"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_type
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field_type
 msgid "Field Type"
 msgstr "字段类型"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__relation_field
 msgid ""
 "Field used to link the related model to the subtype model when using "
 "automatic subscription on a related document. The field is used to compute "
@@ -1767,8 +1652,8 @@ msgid "Fields"
 msgstr "字段"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,help:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,help:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,help:mail.field_mail_template__copyvalue
 msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
@@ -1781,7 +1666,6 @@ msgstr "收拢的"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:696
 #: code:addons/mail/static/src/xml/followers.xml:20
 #, python-format
 msgid "Follow"
@@ -1789,208 +1673,211 @@ msgstr "关注"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_followers
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_follower_ids
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: model:ir.ui.view,arch_db:mail.view_followers_tree
 msgid "Followers"
 msgstr "关注者"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_channel_ids
 msgid "Followers (Channels)"
 msgstr "关注者(渠道)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_partner_ids
 msgid "Followers (Partners)"
 msgstr "关注者(业务伙伴)"
 
@@ -2019,18 +1906,18 @@ msgid "Following"
 msgstr "正在关注中"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_icon
-#: model:ir.model.fields,help:mail.field_mail_activity_type_icon
+#: 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 "绝佳字体图标，例如，fa-task"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_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
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_from
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_email_from
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_from
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__email_from
 msgid "From"
 msgstr "从"
 
@@ -2053,7 +1940,7 @@ msgid "Gateway"
 msgstr "网关"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:55
+#: code:addons/mail/models/res_users.py:54
 #, python-format
 msgid "Go to the configuration panel"
 msgstr "至配置面板"
@@ -2096,228 +1983,235 @@ msgid "Has attachments"
 msgstr "有附件"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_headers
+#: model:ir.model.fields,field_description:mail.field_mail_mail__headers
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "Headers"
 msgstr "头信息"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_hidden
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Hello"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
 msgid "Hidden"
 msgstr "隐藏"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_hidden
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__hidden
 msgid "Hide the subtype in the follower options"
 msgstr "隐藏关注者选项的子类型"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_id
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__id
+#: 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_subtype__id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__id
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__id
+#: model:ir.model.fields,field_description:mail.field_mail_template__id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__id
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mail
-#: 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_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
 msgid ""
 "ID of the parent record holding the alias (example: project holding the task"
 " creation alias)"
 msgstr "上级记录ID支持别名(例如:项目支持任务创建别名)"
 
 #. 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
+#: 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 "图标"
 
 #. 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
+#: 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"
 msgstr "被关注资源的ID"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:119
-#: code:addons/mail/static/src/xml/client_action.xml:203
+#: code:addons/mail/static/src/xml/discuss.xml:119
+#: code:addons/mail/static/src/xml/discuss.xml:203
 #, python-format
 msgid "Idle"
 msgstr "闲置"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,help:mail.field_event_event_message_unread
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread
-#: model:ir.model.fields,help:mail.field_event_track_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,help:mail.field_note_note_message_unread
-#: model:ir.model.fields,help:mail.field_product_product_message_unread
-#: model:ir.model.fields,help:mail.field_product_template_message_unread
-#: model:ir.model.fields,help:mail.field_project_project_message_unread
-#: model:ir.model.fields,help:mail.field_project_task_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread
-#: model:ir.model.fields,help:mail.field_res_users_message_unread
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,help:mail.field_event_event__message_unread
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread
+#: model:ir.model.fields,help:mail.field_event_track__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,help:mail.field_note_note__message_unread
+#: model:ir.model.fields,help:mail.field_product_product__message_unread
+#: model:ir.model.fields,help:mail.field_product_template__message_unread
+#: model:ir.model.fields,help:mail.field_project_project__message_unread
+#: model:ir.model.fields,help:mail.field_project_task__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread
+#: model:ir.model.fields,help:mail.field_res_users__message_unread
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread
 msgid "If checked new messages require your attention."
 msgstr "查看是否有需要留意的新信息。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,help:mail.field_account_payment_message_needaction
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction
 msgid "If checked, new messages require your attention."
 msgstr "如果勾选此项，有新消息会提醒你"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
 msgid ""
 "If checked, the partners will receive an email warning they have been added "
 "in the document's followers."
 msgstr "如果选中该项，业务伙伴们将收到邮件提醒他们已经被添加为单据的关注者。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_user_signature
-#: model:ir.model.fields,help:mail.field_mail_template_user_signature
+#: model:ir.model.fields,help:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,help:mail.field_mail_template__user_signature
 msgid ""
 "If checked, the user's signature will be appended to the text version of the"
 " message"
 msgstr "如果勾选了这里，用户的签名会附加到消息的文本版本"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner_opt_out
-#: model:ir.model.fields,help:mail.field_res_users_opt_out
+#: model:ir.model.fields,help:mail.field_res_partner__opt_out
+#: model:ir.model.fields,help:mail.field_res_users__opt_out
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails for mass "
 "mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
@@ -2325,48 +2219,48 @@ msgid ""
 msgstr "如果选中”退出“，这个联系人拒绝接收群发邮件和市场营销的电子邮件。筛选‘可用于群发邮件'允许用户筛选出允许群发邮件的业务伙伴。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_mail__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible."
 msgstr "如果设置完毕，队列管理员将在指定日期之后发送电子邮件。如果未设置完毕，电子邮件将尽快发送。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_scheduled_date
-#: model:ir.model.fields,help:mail.field_mail_template_scheduled_date
+#: model:ir.model.fields,help:mail.field_email_template_preview__scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_template__scheduled_date
 msgid ""
 "If set, the queue manager will send the email after the date. If not set, "
 "the email will be send as soon as possible. Jinja2 placeholders may be used."
 msgstr "如果设置完毕，队列管理员将在指定日期之后发送电子邮件。如果未设置完毕，电子邮件将尽快发送。可以使用 Jinja2 占位符。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
 msgid ""
 "If you have setup a catch-all email domain redirected to the Odoo server, "
 "enter the domain name here."
 msgstr "如果你设置了电子邮件域名重定向到这个Odoo服务器，请在这里输入域名。"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:141
+#: code:addons/mail/models/mail_alias.py:130
 #, python-format
 msgid "Inactive Alias"
 msgstr "无效的别名"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:655
-#: code:addons/mail/static/src/xml/client_action.xml:22
-#: code:addons/mail/static/src/xml/client_action.xml:154
-#: code:addons/mail/static/src/xml/client_action.xml:164
+#: code:addons/mail/static/src/js/services/chat_manager.js:84
+#: code:addons/mail/static/src/xml/discuss.xml:22
+#: code:addons/mail/static/src/xml/discuss.xml:154
+#: code:addons/mail/static/src/xml/discuss.xml:164
 #, python-format
 msgid "Inbox"
 msgstr "收件箱"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,help:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,help:mail.field_mail_message_parent_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,help:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,help:mail.field_mail_message__parent_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__parent_id
 msgid "Initial thread message."
 msgstr "初始化线程消息"
 
@@ -2377,12 +2271,12 @@ msgid "Integrations"
 msgstr "集成"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__internal
 msgid "Internal Only"
 msgstr "仅仅内部的"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:99
+#: code:addons/mail/models/mail_alias.py:88
 #, python-format
 msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
@@ -2390,7 +2284,8 @@ msgid ""
 msgstr "错误的表达式，必须是符合文法的python字典定义，例如： \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1794
+#: code:addons/mail/models/mail_thread.py:1811
+#: code:addons/mail/models/mail_thread.py:1996
 #, python-format
 msgid ""
 "Invalid record set: should be called as model (without records) or on "
@@ -2398,14 +2293,14 @@ msgid ""
 msgstr "无效的记录集：应为模型(无记录)或记录的记录单"
 
 #. module: mail
-#: code:addons/mail/controllers/main.py:41
+#: code:addons/mail/controllers/main.py:40
 #, python-format
 msgid "Invalid token in route %s"
 msgstr "路由% 含非法的令牌"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "Invitation"
 msgstr "邀请"
@@ -2418,8 +2313,8 @@ msgstr "邀请关注 %s: %s"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:44
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:44
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite"
 msgstr "邀请"
@@ -2433,15 +2328,15 @@ msgstr "邀请关注者"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:31
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/js/discuss.js:29
+#: code:addons/mail/static/src/xml/discuss.xml:133
 #, python-format
 msgid "Invite people"
 msgstr "邀请人员"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:867
+#: code:addons/mail/static/src/js/discuss.js:882
 #, python-format
 msgid "Invite people to #%s"
 msgstr "邀请人员 到 %s"
@@ -2457,95 +2352,96 @@ msgid "Invited people only"
 msgstr "仅邀请人员"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_event_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_note_note_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_product_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_template_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_project_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_task_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_res_users_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_event__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_note_note__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_product__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_product_template__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_project__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_task__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_users__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_is_follower
 msgid "Is Follower"
 msgstr "是关注者"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification
+#: model:ir.model.fields,field_description:mail.field_mail_mail__notification
 msgid "Is Notification"
 msgstr "是通知"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_read
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_read
 msgid "Is Read"
 msgstr "已读"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_subscribed
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_subscribed
 msgid "Is Subscribed"
 msgstr "已订阅"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_member
 msgid "Is a member"
 msgstr "是成员"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
 msgid "Is pinned on the interface"
 msgstr "是否置顶"
 
@@ -2560,144 +2456,76 @@ msgid "Join a group"
 msgstr "加入群组"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_lang
-#: model:ir.model.fields,field_description:mail.field_mail_template_lang
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__lang
+#: model:ir.model.fields,field_description:mail.field_mail_template__lang
 msgid "Language"
 msgstr "语言"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_last_post
-#: 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_payment_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
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_last_post
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_event_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_last_post
-#: model:ir.model.fields,field_description:mail.field_event_track_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_last_post
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_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_test_simple_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_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
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_last_post
-#: model:ir.model.fields,field_description:mail.field_note_note_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_product_message_last_post
-#: model:ir.model.fields,field_description:mail.field_product_template_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_project_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_task_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_last_post
-#: model:ir.model.fields,field_description:mail.field_res_users_message_last_post
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_last_post
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_last_post
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_last_post
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_last_post
-msgid "Last Message Date"
-msgstr "最后消息日期"
-
-#. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner___last_update
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message___last_update
-#: 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_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
-#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract___last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message____last_update
+#: 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_subtype____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_notification____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_template____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_thread____last_update
+#: 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
+#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract____last_update
 msgid "Last Modified on"
 msgstr "最后修改日"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_last_seen_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_seen_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_last_seen_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__seen_message_id
 msgid "Last Seen"
 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_uid
-#: 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_tracking_value_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_uid
 msgid "Last Updated by"
 msgstr "最后更新人"
 
 #. 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
-#: model:ir.model.fields,field_description:mail.field_mail_channel_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_mail_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_write_date
-#: 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_tracking_value_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_date
 msgid "Last Updated on"
 msgstr "最后更新时间"
 
@@ -2721,37 +2549,37 @@ msgstr "休假"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:687
-#: code:addons/mail/static/src/xml/client_action.xml:112
+#: code:addons/mail/models/mail_channel.py:693
+#: code:addons/mail/static/src/xml/discuss.xml:112
 #, python-format
 msgid "Leave this channel"
 msgstr "退出此频道"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_channel_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__channel_ids
 msgid ""
 "List of channels that will be added as listeners of the current document."
 msgstr "将被添加为当前文档的侦听器的频道列表。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__partner_ids
 msgid ""
 "List of partners that will be added as follower of the current document."
 msgstr "列表中的业务伙伴将添加至当前单据的关注者。"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:698
+#: code:addons/mail/models/mail_channel.py:704
 #, python-format
 msgid "List users in the current channel"
 msgstr "在当前频道列出用户"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__channel_id
 msgid "Listener"
 msgstr "侦听器"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_partner_ids
 msgid "Listeners"
 msgstr "侦听器"
 
@@ -2767,7 +2595,7 @@ msgstr "在线聊天对话"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:31
+#: code:addons/mail/static/src/js/chatter_composer.js:30
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Log"
@@ -2791,8 +2619,8 @@ 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__is_log
 msgid "Log an Internal Note"
 msgstr "记录内部备注"
 
@@ -2811,10 +2639,10 @@ msgid "Log or schedule an activity"
 msgstr "记录或安排活动"
 
 #. 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
+#: 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 "邮件活动类型"
 
@@ -2824,13 +2652,13 @@ msgid "Mail Channel Form"
 msgstr "邮件频道表单"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:369
+#: code:addons/mail/models/mail_mail.py:367
 #, python-format
 msgid "Mail Delivery Failed"
 msgstr "邮件发送失败"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,field_description:mail.field_ir_model__is_mail_thread
 #: model:ir.ui.view,arch_db:mail.model_search_view
 msgid "Mail Thread"
 msgstr "邮件线程"
@@ -2841,7 +2669,7 @@ msgid "Mail Tracking Value"
 msgstr "邮件追踪值"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_notification
+#: model:ir.model.fields,help:mail.field_mail_mail__notification
 msgid "Mail has been created to notify people of an existing mail.message"
 msgstr "邮件被创建，以通知现有的邮件消息的人"
 
@@ -2853,7 +2681,7 @@ msgid "Mail: Email Queue Manager"
 msgstr "Mail: Email 队列管理器"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:832
+#: code:addons/mail/models/mail_thread.py:813
 #, python-format
 msgid "Mailbox unavailable - %s"
 msgstr "Mailbox 不可用- %s"
@@ -2872,14 +2700,14 @@ msgstr "标记完成"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all as read"
 msgstr "标记全部已读"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:134
 #, python-format
 msgid "Mark all read"
 msgstr "标记全部已读"
@@ -2891,15 +2719,15 @@ msgstr "标记为完成"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:206
+#: code:addons/mail/static/src/xml/thread.xml:211
 #, python-format
 msgid "Mark as Read"
 msgstr "标记为已读"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:153
-#: code:addons/mail/static/src/xml/thread.xml:200
+#: code:addons/mail/static/src/xml/thread.xml:158
+#: code:addons/mail/static/src/xml/thread.xml:205
 #, python-format
 msgid "Mark as Todo"
 msgstr "标记为待办"
@@ -2912,12 +2740,12 @@ msgid "Mark as done"
 msgstr "标记为完成"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_medium
 msgid "Medium-sized photo"
 msgstr "中等尺寸照片"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_medium
+#: model:ir.model.fields,help:mail.field_mail_channel__image_medium
 msgid ""
 "Medium-sized photo of the group. It is automatically resized as a 128x128px "
 "image, with aspect ratio preserved. Use this field in form views or some "
@@ -2936,23 +2764,29 @@ msgid "Members"
 msgstr "会员"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_group_ids
+#: model:ir.model.fields,help:mail.field_mail_channel__group_ids
 msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
 msgstr "这些群组的成员将自动添加为关注者。注意, 如果有必要，他们能手工管理他们的订阅。"
 
 #. module: mail
+#: code:addons/mail/wizard/base_partner_merge.py:13
+#, python-format
+msgid "Merged with the following partners:"
+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.model.fields,field_description:mail.field_mail_mail__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Message"
 msgstr "消息"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
 msgid "Message ID"
 msgstr "邮件消息ID"
 
@@ -2962,37 +2796,37 @@ 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
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_mail__record_name
+#: model:ir.model.fields,field_description:mail.field_mail_message__record_name
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__record_name
 msgid "Message Record Name"
 msgstr "消息记录名称"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__name
 msgid "Message Type"
 msgstr "消息类型"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_email_to
+#: model:ir.model.fields,help:mail.field_mail_mail__email_to
 msgid "Message recipients (emails)"
 msgstr "消息收件人(电子邮件)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_references
+#: model:ir.model.fields,help:mail.field_mail_mail__references
 msgid "Message references, such as identifiers of previous messages"
 msgstr "消息引用"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
+#: code:addons/mail/static/src/xml/discuss.xml:124
 #, python-format
 msgid "Message sent in \""
 msgstr "信息发送了 \""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_name
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__name
 msgid ""
 "Message subtype gives a more precise type on the message, especially for "
 "system notifications. For example, it can be a notification related to a new"
@@ -3008,104 +2842,105 @@ msgid "Message subtypes"
 msgstr "消息子类型"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_followers_subtype_ids
+#: model:ir.model.fields,help:mail.field_mail_followers__subtype_ids
 msgid ""
 "Message subtypes followed, meaning subtypes that will be pushed onto the "
 "user's Wall."
 msgstr "子类型消息被关注，意味着子类型将被推送进用户的墙内。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,help:mail.field_mail_mail_message_type
-#: model:ir.model.fields,help:mail.field_mail_message_message_type
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,help:mail.field_mail_mail__message_type
+#: model:ir.model.fields,help:mail.field_mail_message__message_type
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_type
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr "消息类型：电子邮件用于 邮件消息， 通知用户系统消息，评论用于其他消息，例如用户回复。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,help:mail.field_mail_mail_message_id
-#: model:ir.model.fields,help:mail.field_mail_message_message_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,help:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,help:mail.field_mail_mail__message_id
+#: model:ir.model.fields,help:mail.field_mail_message__message_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_id
 msgid "Message unique identifier"
 msgstr "消息唯一编号"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_id
 msgid "Message-Id"
 msgstr "Message-Id"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_event_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_ids
-#: model:ir.model.fields,field_description:mail.field_event_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_product_message_ids
-#: model:ir.model.fields,field_description:mail.field_product_template_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_project_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_task_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_ids
-#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_ids
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_event__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_ids
+#: model:ir.model.fields,field_description:mail.field_event_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_ids
+#: model:ir.model.fields,field_description:mail.field_note_note__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_product__message_ids
+#: model:ir.model.fields,field_description:mail.field_product_template__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_project__message_ids
+#: model:ir.model.fields,field_description:mail.field_project_task__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_ids
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_users__message_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_ids
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_ids
 #: model:ir.ui.menu,name:mail.menu_mail_message
 #: model:ir.ui.view,arch_db:mail.view_message_tree
 msgid "Messages"
@@ -3124,27 +2959,27 @@ msgid "Messages can be <b>starred</b> to remind you to check back later."
 msgstr "消息可以 <b>starred</b> 以提醒你后面再来检查."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_internal
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__internal
 msgid ""
 "Messages with internal subtypes will be visible only by employees, aka "
 "members of base_user group"
 msgstr "内部的消息将只有员工可见，即基础用户组成员"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_res_model_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_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
 msgid "Model"
 msgstr "模型"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_wizard_invite_res_model
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__res_model
 msgid "Model of the followed resource"
 msgstr "关注资源的模型"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_res_model
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__res_model
 msgid ""
 "Model the subtype applies to. If False, this subtype applies to all models."
 msgstr "子类型适用的模型：如果 假，子类型适用于所有模型"
@@ -3171,25 +3006,25 @@ 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_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.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Name"
 msgstr "名称"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_record_name
-#: model:ir.model.fields,help:mail.field_mail_mail_record_name
-#: model:ir.model.fields,help:mail.field_mail_message_record_name
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_record_name
+#: model:ir.model.fields,help:mail.field_mail_compose_message__record_name
+#: model:ir.model.fields,help:mail.field_mail_mail__record_name
+#: model:ir.model.fields,help:mail.field_mail_message__record_name
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__record_name
 msgid "Name get of the related document."
 msgstr "获得相关单据的名称"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,help:mail.field_mail_template_report_name
+#: model:ir.model.fields,help:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,help:mail.field_mail_template__report_name
 msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
@@ -3198,71 +3033,71 @@ msgstr ""
 "不需要指定扩展名，会按照报表类型指定扩展名"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_mail_needaction
-#: model:ir.model.fields,help:mail.field_mail_message_needaction
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_compose_message__needaction
+#: model:ir.model.fields,help:mail.field_mail_mail__needaction
+#: model:ir.model.fields,help:mail.field_mail_message__needaction
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__needaction
 #: model:ir.ui.view,arch_db:mail.view_message_search
 msgid "Need Action"
 msgstr "待处理"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_res_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
 msgid "Needaction Recipient"
 msgstr "Needaction 收件人"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:138
+#: code:addons/mail/static/src/xml/discuss.xml:138
 #, python-format
 msgid "New Channel"
 msgstr "新频道"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:137
+#: code:addons/mail/static/src/xml/discuss.xml:137
 #, python-format
 msgid "New Message"
 msgstr "新消息"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_char
 msgid "New Value Char"
 msgstr "新字符值"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_datetime
 msgid "New Value Datetime"
 msgstr "新日期时间值"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_float
 msgid "New Value Float"
 msgstr "新浮点值"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_integer
 msgid "New Value Integer"
 msgstr "新整数值"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_monetary
 msgid "New Value Monetary"
 msgstr "新货币值"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_text
 msgid "New Value Text"
 msgstr "新文本值"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:55
-#: code:addons/mail/static/src/js/window_manager.js:139
+#: code:addons/mail/static/src/js/services/chat_manager.js:1625
+#: code:addons/mail/static/src/js/services/chat_window_manager.js:283
 #: code:addons/mail/static/src/xml/systray.xml:12
 #: code:addons/mail/static/src/xml/systray.xml:21
 #, python-format
@@ -3271,21 +3106,21 @@ msgstr "新建消息"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:233
+#: code:addons/mail/static/src/xml/thread.xml:238
 #, python-format
 msgid "New messages"
 msgstr "新建消息"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:110
+#: code:addons/mail/static/src/xml/thread.xml:115
 #, python-format
 msgid "New messages appear here."
 msgstr "新消息出现在这里"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:97
+#: code:addons/mail/static/src/js/discuss.js:99
 #, python-format
 msgid "New people"
 msgstr "新用户"
@@ -3296,85 +3131,85 @@ msgid "Next Activities"
 msgstr "下一步活动"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_date_deadline
 msgid "Next Activity Deadline"
 msgstr "下一活动截止日期"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_summary
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_summary
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_summary
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_summary
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_summary
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_summary
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_summary
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_summary
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_summary
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_summary
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_summary
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_summary
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_summary
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_summary
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_summary
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_summary
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_summary
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_summary
 msgid "Next Activity Summary"
 msgstr "下一个活动摘要"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_type_id
 msgid "Next Activity Type"
 msgstr "下一活动类型"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,field_description:mail.field_mail_activity__has_recommended_activities
 msgid "Next activities available"
 msgstr "下一活动可用"
 
@@ -3416,28 +3251,28 @@ msgstr "找不到与你查找相匹配的消息。试着更改搜索筛选"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:113
+#: code:addons/mail/static/src/xml/thread.xml:118
 #, python-format
 msgid "No starred message"
 msgstr "没有标星的消息"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_mail_message_no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_mail__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_mail_message__no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__no_auto_thread
 msgid "No threading for answers"
 msgstr "答案没有线程"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_note
+#: model:ir.model.fields,field_description:mail.field_mail_activity__note
 #: model:mail.message.subtype,name:mail.mt_note
 msgid "Note"
 msgstr "备注"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:157
+#: code:addons/mail/static/src/xml/thread.xml:162
 #, python-format
 msgid "Note by"
 msgstr "备注"
@@ -3448,249 +3283,254 @@ msgid "Notification"
 msgstr "通知"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_users_notification_type
+#: model:ir.model.fields,field_description:mail.field_res_users__notification_type
 msgid "Notification Management"
 msgstr "通知管理"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_notification_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_notification_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_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 "通知"
 
 #. 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
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers"
 msgstr "通知关注者"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_notify
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_notify
+#: model:ir.model.fields,help:mail.field_mail_compose_message__notify
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__notify
 msgid "Notify followers of the document (mass post only)"
 msgstr "通知此单据的关注者(只用于批量发送)"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of Actions"
 msgstr "行动数量"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_days
+#: 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_payment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction_counter
 msgid "Number of messages which requires an action"
 msgstr "需要行动消息的数量"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,help:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,help:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,help:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,help:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,help:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,help:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,help:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,help:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,help:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread_counter
 msgid "Number of unread messages"
 msgstr "未读消息的数量"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model:ir.ui.view,arch_db:mail.message_notification_email
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Odoo"
 msgstr "Odoo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:895
+#: code:addons/mail/static/src/js/discuss.js:910
 #, python-format
 msgid ""
 "Odoo has now the permission to send you native notifications on this device."
@@ -3698,14 +3538,14 @@ msgstr "Odoo 现在有权限在该设备上发送本地通知。"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "Odoo needs your permission to"
 msgstr "Odoo需要你的权限进行"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:892
+#: code:addons/mail/static/src/js/discuss.js:907
 #, python-format
 msgid ""
 "Odoo will not have the permission to send native notifications on this "
@@ -3714,38 +3554,38 @@ msgstr "Odoo 没有权限在该设备上发送本地通知。"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:120
+#: code:addons/mail/static/src/xml/discuss.xml:120
 #, python-format
 msgid "Offline"
 msgstr "离线"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_char
 msgid "Old Value Char"
 msgstr "旧字符值"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_datetime
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_datetime
 msgid "Old Value DateTime"
 msgstr "旧日期时间值"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_float
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_float
 msgid "Old Value Float"
 msgstr "旧浮点值"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_integer
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_integer
 msgid "Old Value Integer"
 msgstr "旧整数值"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_monetary
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_monetary
 msgid "Old Value Monetary"
 msgstr "旧货币值"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_text
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__old_value_text
 msgid "Old Value Text"
 msgstr "旧文本值"
 
@@ -3772,14 +3612,14 @@ msgstr "关注者"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:118
-#: code:addons/mail/static/src/xml/client_action.xml:202
+#: code:addons/mail/static/src/xml/discuss.xml:118
+#: code:addons/mail/static/src/xml/discuss.xml:202
 #, python-format
 msgid "Online"
 msgstr "在线"
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:22
+#: code:addons/mail/models/ir_model.py:28
 #, python-format
 msgid "Only custom models can be modified."
 msgstr "仅有自定义模型能被修改."
@@ -3801,14 +3641,14 @@ msgstr "打开上级单据"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Open channel settings"
 msgstr "打开频道设定"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:187
+#: code:addons/mail/static/src/xml/discuss.xml:187
 #, python-format
 msgid "Open chat"
 msgstr "打开聊天"
@@ -3821,15 +3661,15 @@ 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
+#: 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"
 msgstr "退出"
 
 #. module: mail
-#: 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_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
 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 "
@@ -3837,22 +3677,22 @@ msgid ""
 msgstr "所有的进来的邮件都将附上一条线索（记录）选配的ID，即使它们不曾回复过它。如果设置了，这个将完全阻止新记录的创建。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,help:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,help:mail.field_mail_template__mail_server_id
 msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
 msgstr "可选的推荐发信邮件服务器。如果没有设置，优先级最高的一个会被选中。"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_template
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_template
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_template
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_template
 msgid "Optional report to print and attach"
 msgstr "可选的打印和附加的报表"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_lang
-#: model:ir.model.fields,help:mail.field_mail_template_lang
+#: model:ir.model.fields,help:mail.field_email_template_preview__lang
+#: model:ir.model.fields,help:mail.field_mail_template__lang
 msgid ""
 "Optional translation language (ISO code) to select when sending out an "
 "email. If not set, the english version will be used. This should usually be "
@@ -3863,8 +3703,8 @@ msgstr ""
 "代码）。如果没有设置，会使用英文版本。一般用占位符来确定合适的语言，例如：${object.partner_id.lang.code}。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_null_value
-#: model:ir.model.fields,help:mail.field_mail_template_null_value
+#: model:ir.model.fields,help:mail.field_email_template_preview__null_value
+#: model:ir.model.fields,help:mail.field_mail_template__null_value
 msgid "Optional value to use if the target field is empty"
 msgstr "如果目标字段为空则使用此可选值"
 
@@ -3879,8 +3719,8 @@ msgid "Outgoing"
 msgstr "出局"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_template_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_template__mail_server_id
 msgid "Outgoing Mail Server"
 msgstr "发信邮件服务器"
 
@@ -3890,10 +3730,10 @@ msgid "Outgoing Mails"
 msgstr "出去的邮件"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_mail_server_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__mail_server_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_server_id
 msgid "Outgoing mail server"
 msgstr "发信邮件服务器"
 
@@ -3907,12 +3747,12 @@ msgstr "发信邮件服务器"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -3926,43 +3766,43 @@ msgid "Override author's email"
 msgstr "覆盖作者电子邮件"
 
 #. module: mail
-#: 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_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
 msgid "Owner"
 msgstr "所有者"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__parent_id
 msgid "Parent"
 msgstr "上级"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_parent_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_parent_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__parent_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__parent_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__parent_id
 msgid "Parent Message"
 msgstr "上级消息"
 
 #. module: mail
-#: 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_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
 msgid "Parent Model"
 msgstr "上级模型"
 
 #. module: mail
-#: 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_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
 msgid "Parent Record Thread ID"
 msgstr "上级记录线程ID"
 
 #. module: mail
-#: 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_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
 msgid ""
 "Parent model holding the alias. The model holding the alias reference is not"
 " necessarily the model given by alias_model_id (example: project "
@@ -3972,7 +3812,7 @@ msgstr ""
 " task (model))"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_parent_id
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__parent_id
 msgid ""
 "Parent subtype, used for automatic subscription. This field is not correctly"
 " named. For example on a project, the parent_id of project subtypes refers "
@@ -3996,42 +3836,42 @@ msgid "Partners that did not ask not to be included in mass mailing campaigns"
 msgstr "没有要求排除在邮件群发活动之外的业务伙伴"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction_partner_ids
 msgid "Partners with Need Action"
 msgstr "待处理的业务伙伴"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_mail_auto_delete
-#: model:ir.model.fields,help:mail.field_mail_template_auto_delete
+#: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_template__auto_delete
 msgid "Permanently delete this email after sending it, to save space"
 msgstr "发送后永久删除这个邮件，以节省空间。"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:891
+#: code:addons/mail/static/src/js/discuss.js:906
 #, python-format
 msgid "Permission denied"
 msgstr "权限拒绝"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:894
+#: code:addons/mail/static/src/js/discuss.js:909
 #, python-format
 msgid "Permission granted"
 msgstr "权限授予"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image
 msgid "Photo"
 msgstr "照片"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_copyvalue
-#: model:ir.model.fields,field_description:mail.field_mail_template_copyvalue
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__copyvalue
+#: model:ir.model.fields,field_description:mail.field_mail_template__copyvalue
 msgid "Placeholder Expression"
 msgstr "占位符表达式"
 
@@ -4045,12 +3885,12 @@ msgstr "占位符表达式"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4066,49 +3906,56 @@ msgid "Planned activities"
 msgstr "计划的活动"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__days
+msgid "Planned in"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:282
+#: code:addons/mail/static/src/xml/thread.xml:287
 #, python-format
 msgid "Play this video"
 msgstr "播放此视频"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:158
+#: code:addons/mail/static/src/js/chatter_composer.js:157
 #, python-format
 msgid "Please complete customer's informations"
 msgstr "请填写客户的信息"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:84
+#: code:addons/mail/static/src/js/many2many_tags_email.js:96
 #, python-format
 msgid "Please complete customer's informations and email"
 msgstr "请填写客户的信息和电子邮件"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Please contact us instead using"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Please, wait while the file is uploading."
 msgstr "当文件上传时，请等待。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_notification_type
+#: model:ir.model.fields,help:mail.field_res_users__notification_type
 msgid ""
 "Policy on how to handle Chatter notifications:\n"
-"- Emails: notifications are sent to your email\n"
-"- Odoo: notifications appear in your Odoo Inbox"
+"- Handle by Emails: notifications are sent to your email address\n"
+"- Handle in Odoo: notifications appear in your Odoo Inbox"
 msgstr ""
-"关于如何处理聊天通知的策略：\n"
-"-电子邮件：发送通知到电子邮件中 \n"
-"-Odoo：在 Odoo 收件箱中显示通知"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_alias_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_contact
-#: model:ir.model.fields,help:mail.field_mail_channel_alias_contact
-#: model:ir.model.fields,help:mail.field_res_users_alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin__alias_contact
+#: model:ir.model.fields,help:mail.field_mail_channel__alias_contact
+#: model:ir.model.fields,help:mail.field_res_users__alias_contact
 msgid ""
 "Policy to post a message on the document using the mailgateway.\n"
 "- everyone: everyone can post\n"
@@ -4121,12 +3968,13 @@ msgstr ""
 "- followers: 只有相关文件或下列频道成员的跟随者\n"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_borders
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "Powered by"
 msgstr "官方技术支持"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_previous_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__previous_type_ids
 msgid "Preceding Activities"
 msgstr "前活动"
 
@@ -4136,8 +3984,8 @@ msgid "Preferred reply address"
 msgstr "首选回复地址"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,help:mail.field_mail_template_reply_to
+#: model:ir.model.fields,help:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,help:mail.field_mail_template__reply_to
 msgid "Preferred response address (placeholders may be used here)"
 msgstr "首选的响应地址（可以在这里用占位符）"
 
@@ -4152,27 +4000,27 @@ msgid "Preview of"
 msgstr "预览"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_previous_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__previous_activity_type_id
 msgid "Previous Activity Type"
 msgstr "前一活动类型"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_public
+#: model:ir.model.fields,field_description:mail.field_mail_channel__public
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Privacy"
 msgstr "隐私"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:56
-#: code:addons/mail/static/src/xml/client_action.xml:176
+#: code:addons/mail/static/src/xml/discuss.xml:56
+#: code:addons/mail/static/src/xml/discuss.xml:176
 #, python-format
 msgid "Private Channels"
 msgstr "私人频道"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:848
+#: code:addons/mail/static/src/js/discuss.js:863
 #, python-format
 msgid "Public Channels"
 msgstr "公众频道"
@@ -4201,68 +4049,72 @@ msgid "Received"
 msgstr "已接收"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_id
 msgid "Recipient"
 msgstr "收件人"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_partner_ids
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Recipients"
 msgstr "收件人"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_recommended_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__recommended_activity_type_id
 msgid "Recommended Activity Type"
 msgstr "推荐的活动类型"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_next_type_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__next_type_ids
 msgid "Recommended Next Activities"
 msgstr "推荐的下一活动"
 
 #. module: mail
-#: 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_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
 msgid "Record Thread ID"
 msgstr "记录线索ID"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_references
+#: model:ir.model.fields,field_description:mail.field_mail_mail__references
 msgid "References"
 msgstr "参考"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_mail_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_id
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_res_id
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Regards,"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__res_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__res_id
 msgid "Related Document ID"
 msgstr "相关单据编号"
 
 #. 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_mail_model
-#: model:ir.model.fields,field_description:mail.field_mail_message_model
-#: model:ir.model.fields,field_description:mail.field_mail_template_model
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_model
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_model
+#: 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_compose_message__model
+#: 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
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_model
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__model
 msgid "Related Document Model"
 msgstr "相关的单据模型"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_res_model
+#: model:ir.model.fields,field_description:mail.field_mail_followers__res_model
 msgid "Related Document Model Name"
 msgstr "相关的单据模型名称"
 
@@ -4272,12 +4124,12 @@ msgid "Related Message"
 msgstr "相关的消息"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_followers_partner_id
+#: model:ir.model.fields,field_description:mail.field_mail_followers__partner_id
 msgid "Related Partner"
 msgstr "相关的业务伙伴"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_relation_field
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__relation_field
 msgid "Relation field"
 msgstr "关系字段"
 
@@ -4295,63 +4147,63 @@ msgstr "移除此关注者"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:203
+#: code:addons/mail/static/src/xml/thread.xml:208
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Reply"
 msgstr "回复"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,help:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,help:mail.field_mail_message_reply_to
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,help:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,help:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,help:mail.field_mail_message__reply_to
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__reply_to
 msgid ""
 "Reply email address. Setting the reply_to bypasses the automatic thread "
 "creation."
 msgstr "回复邮件地址。设置回复到reply_to旁路自动线程创建。"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_mail_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_message_reply_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_reply_to
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_reply_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_message__reply_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__reply_to
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__reply_to
 msgid "Reply-To"
 msgstr "回复 至"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_report_name
-#: model:ir.model.fields,field_description:mail.field_mail_template_report_name
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__report_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__report_name
 msgid "Report Filename"
 msgstr "报告文件名"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_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 "负责人"
+#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_event_track__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_note_note__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_product__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_template__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_project_task__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_repair_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_users__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_sale_order__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_user_id
+msgid "Responsible User"
+msgstr "责任用户"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
@@ -4360,12 +4212,12 @@ msgid "Retry"
 msgstr "重试"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_body_html
+#: model:ir.model.fields,field_description:mail.field_mail_mail__body_html
 msgid "Rich-text Contents"
 msgstr "富文本内容"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_mail_body_html
+#: model:ir.model.fields,help:mail.field_mail_mail__body_html
 msgid "Rich-text/HTML message"
 msgstr "富文本/HTML消息"
 
@@ -4375,7 +4227,7 @@ msgid "SMTP Server"
 msgstr "SMTP 服务器"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_res_id
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__res_id
 msgid "Sample Document"
 msgstr "示例文档"
 
@@ -4409,26 +4261,26 @@ msgid "Schedule activity"
 msgstr "安排活动"
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:250
+#: code:addons/mail/models/mail_activity.py:260
 #, python-format
 msgid "Schedule an Activity"
 msgstr "安排活动"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:57
 #, 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
+#: 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"
 msgstr "计划日期"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_scheduled_date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__scheduled_date
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Scheduled Send Date"
 msgstr "安排的发送日期"
@@ -4444,8 +4296,8 @@ msgid "Search Groups"
 msgstr "搜索群组"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__model_object_field
 msgid ""
 "Select target field from the related document model.\n"
 "If it is a relationship field you will be able to select a target field at the destination of the relationship."
@@ -4460,19 +4312,19 @@ msgstr "选择用户组"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:374
+#: code:addons/mail/static/src/js/composer.js:428
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Send"
 msgstr "发送"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_send_mail
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail
 msgid "Send Email"
 msgstr "发送电子邮件"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:264
+#: code:addons/mail/models/mail_template.py:295
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "发送邮件（ %s）"
@@ -4498,13 +4350,13 @@ msgid "Send message"
 msgstr "发送消息"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
+#: 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_mail_template_email_from
+#: model:ir.model.fields,help:mail.field_email_template_preview__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 "
 "value will be the author's email alias if configured, or email address."
@@ -4512,14 +4364,14 @@ msgstr "发送人地址（所在位置会被在这里使用），如果不设置
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Sending Error"
 msgstr "正在发送错误"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:108
+#: code:addons/mail/static/src/xml/discuss.xml:108
 #, python-format
 msgid "Sends messages by email"
 msgstr "以邮件形式发送"
@@ -4531,25 +4383,30 @@ msgid "Sent"
 msgstr "已汇"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_email
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "Sent by"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__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
+#: 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 "序号"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:139
 #, python-format
 msgid "Settings"
 msgstr "设置"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_shortcode_type
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__shortcode_type
 msgid "Shortcode Type"
 msgstr "短码类型"
 
@@ -4560,7 +4417,7 @@ msgid "Shortcodes"
 msgstr "短码"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__source
 msgid "Shortcut"
 msgstr "快捷"
 
@@ -4571,30 +4428,30 @@ msgid "Show all records which has next action date is before today"
 msgstr "显示在今天之前的下一个行动日期的所有记录"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:667
+#: code:addons/mail/models/mail_channel.py:673
 #, python-format
 msgid "Show an helper message"
 msgstr "显示帮助者信息"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,field_description:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,field_description:mail.field_mail_template__ref_ir_act_window
 msgid "Sidebar action"
 msgstr "边栏动作"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_ref_ir_act_window
-#: model:ir.model.fields,help:mail.field_mail_template_ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_email_template_preview__ref_ir_act_window
+#: model:ir.model.fields,help:mail.field_mail_template__ref_ir_act_window
 msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
 msgstr "用于在相关单据上调用此模版的边栏按钮"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_mail_author_avatar
-#: model:ir.model.fields,help:mail.field_mail_message_author_avatar
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_avatar
+#: model:ir.model.fields,help:mail.field_mail_compose_message__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_mail__author_avatar
+#: model:ir.model.fields,help:mail.field_mail_message__author_avatar
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_avatar
 msgid ""
 "Small-sized image of this contact. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4602,12 +4459,12 @@ msgid ""
 msgstr "联系人小尺寸图像。自动缩放为64x64px ，保留纵横比。此字段用于任何需要小图像的场合"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_small
+#: model:ir.model.fields,field_description:mail.field_mail_channel__image_small
 msgid "Small-sized photo"
 msgstr "小尺寸照片"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image_small
+#: model:ir.model.fields,help:mail.field_mail_channel__image_small
 msgid ""
 "Small-sized photo of the group. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -4620,7 +4477,7 @@ msgid "Smiley"
 msgstr "表情符"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type_res_model_id
+#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_id
 msgid ""
 "Specify a model if the activity should be specific to a model and not "
 "available when managing activities for other models."
@@ -4628,74 +4485,52 @@ msgstr "如果活动应特定于某个模型并且在管理其他模型的活动
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:661
-#: code:addons/mail/static/src/xml/client_action.xml:28
-#: code:addons/mail/static/src/xml/client_action.xml:156
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
-#: model:ir.model.fields,field_description:mail.field_mail_mail_starred
-#: model:ir.model.fields,field_description:mail.field_mail_message_starred
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred
+#: code:addons/mail/static/src/js/services/chat_manager.js:89
+#: code:addons/mail/static/src/xml/discuss.xml:28
+#: code:addons/mail/static/src/xml/discuss.xml:156
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred
 #, python-format
 msgid "Starred"
 msgstr "加星的邮件"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,field_description:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,field_description:mail.field_event_track_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,field_description:mail.field_product_template_activity_state
-#: model:ir.model.fields,field_description:mail.field_project_task_activity_state
-#: model:ir.model.fields,field_description:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.model.fields,field_description:mail.field_mail_activity__state
 msgid "State"
 msgstr "状态"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_state
+#: 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
 msgid "Status"
 msgstr "状态"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_account_invoice_activity_state
-#: model:ir.model.fields,help:mail.field_crm_lead_activity_state
-#: model:ir.model.fields,help:mail.field_event_track_activity_state
-#: model:ir.model.fields,help:mail.field_hr_applicant_activity_state
-#: model:ir.model.fields,help:mail.field_hr_employee_activity_state
-#: model:ir.model.fields,help:mail.field_mail_activity_mixin_activity_state
-#: model:ir.model.fields,help:mail.field_mail_test_activity_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_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_product_product_activity_state
-#: model:ir.model.fields,help:mail.field_product_template_activity_state
-#: model:ir.model.fields,help:mail.field_project_task_activity_state
-#: model:ir.model.fields,help:mail.field_purchase_order_activity_state
-#: model:ir.model.fields,help:mail.field_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
+#: model:ir.model.fields,help:mail.field_account_invoice__activity_state
+#: model:ir.model.fields,help:mail.field_crm_lead__activity_state
+#: model:ir.model.fields,help:mail.field_event_track__activity_state
+#: model:ir.model.fields,help:mail.field_hr_applicant__activity_state
+#: model:ir.model.fields,help:mail.field_hr_employee__activity_state
+#: model:ir.model.fields,help:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,help:mail.field_mail_test_activity__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,help:mail.field_maintenance_request__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_production__activity_state
+#: model:ir.model.fields,help:mail.field_mrp_unbuild__activity_state
+#: model:ir.model.fields,help:mail.field_note_note__activity_state
+#: model:ir.model.fields,help:mail.field_product_product__activity_state
+#: model:ir.model.fields,help:mail.field_product_template__activity_state
+#: model:ir.model.fields,help:mail.field_project_task__activity_state
+#: model:ir.model.fields,help:mail.field_purchase_order__activity_state
+#: model:ir.model.fields,help:mail.field_repair_order__activity_state
+#: model:ir.model.fields,help:mail.field_res_partner__activity_state
+#: model:ir.model.fields,help:mail.field_res_users__activity_state
+#: model:ir.model.fields,help:mail.field_sale_order__activity_state
+#: model:ir.model.fields,help:mail.field_stock_picking__activity_state
+#: model:ir.model.fields,help:mail.field_survey_survey__activity_state
 msgid ""
 "Status based on activities\n"
 "Overdue: Due date is already passed\n"
@@ -4708,33 +4543,33 @@ 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
+#: 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"
 msgstr "子字段"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,field_description:mail.field_mail_template_sub_object
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,field_description:mail.field_mail_template__sub_object
 msgid "Sub-model"
 msgstr "子模型"
 
 #. module: mail
 #. 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_mail_compose_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_mail_subject
-#: model:ir.model.fields,field_description:mail.field_mail_message_subject
-#: model:ir.model.fields,field_description:mail.field_mail_template_subject
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subject
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__subject
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_mail__subject
+#: model:ir.model.fields,field_description:mail.field_mail_message__subject
+#: model:ir.model.fields,field_description:mail.field_mail_template__subject
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subject
 #, python-format
 msgid "Subject"
 msgstr "主题"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_subject
-#: model:ir.model.fields,help:mail.field_mail_template_subject
+#: model:ir.model.fields,help:mail.field_email_template_preview__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)"
 msgstr "主题（可以在这里使用占位符）"
@@ -4746,22 +4581,22 @@ msgstr "主题..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:216
+#: code:addons/mail/static/src/xml/thread.xml:221
 #, python-format
 msgid "Subject:"
 msgstr "主题:"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_substitution
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__substitution
 msgid "Substitution"
 msgstr "替换"
 
 #. module: mail
-#: 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_1993
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subtype_id
+#: 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
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subtype_id
 #: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
 msgid "Subtype"
 msgstr "子类型"
@@ -4773,8 +4608,8 @@ msgid "Subtypes"
 msgstr "子类型"
 
 #. 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
+#: 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 "摘要"
 
@@ -4786,7 +4621,7 @@ msgid "System notification"
 msgstr "系统通知"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_has_recommended_activities
+#: model:ir.model.fields,help:mail.field_mail_activity__has_recommended_activities
 msgid "Technical field for UX purpose"
 msgstr "用于UX目的技术字段"
 
@@ -4796,6 +4631,14 @@ msgid "Template Preview"
 msgstr "模板预览"
 
 #. module: mail
+#: code:addons/mail/models/mail_template.py:264
+#, python-format
+msgid ""
+"Template rendering failed, this could mean that your template contains "
+"python syntax errors"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_template_tree_all
 #: model:ir.ui.menu,name:mail.menu_email_templates
 #: model:ir.ui.view,arch_db:mail.email_template_form
@@ -4805,14 +4648,24 @@ msgid "Templates"
 msgstr "模板"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The"
+msgstr "此"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The email sent to"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_shortcode__substitution
 msgid "The escaped html code replacing the shortcut"
 msgstr "html 转义码替换快捷方式"
 
 #. module: mail
-#: 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_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
 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 "
@@ -4821,18 +4674,18 @@ msgstr ""
 "相应于这个别名对应的模型(Odoo单据种类)。任何一封不属于对某个已存在的记录的到来邮件，将导致此模块中新记录的创建(例如，一个新的项目任务)。"
 
 #. module: mail
-#: 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_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
 msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
 msgstr "邮件别名的名称，例如，如果你要收取 <jobs@example.odoo.com> 的电子邮件,别名就要被设为：\"jobs\""
 
 #. module: mail
-#: 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_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
 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 "
@@ -4842,9 +4695,9 @@ msgstr ""
 "基于此别名接收到的邮件，创建记录的所有人。若此字段没有设置，系统将试图根据发送者(From)地址来查找正确的所有者，如果对于那个地址没有系统用户被发现，将使用系统管理员账户。"
 
 #. module: mail
-#: code:addons/mail/models/mail_activity.py:165
-#: code:addons/mail/models/mail_message.py:579
-#: code:addons/mail/models/mail_message.py:674
+#: code:addons/mail/models/mail_activity.py:175
+#: code:addons/mail/models/mail_message.py:578
+#: code:addons/mail/models/mail_message.py:678
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -4856,18 +4709,18 @@ msgstr ""
 "(单据类型: %s, 操作: %s)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__source
 msgid "The shortcut which must be replaced in the Chat Messages"
 msgstr "在聊天信息中，必须替换掉的快捷方式"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,help:mail.field_mail_shortcode__unicode_source
 msgid "The source is replaced by this unicode character in the Chat Messages"
 msgstr "在聊天信息中，通过该统一字符替换源"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,help:mail.field_mail_template_model_id
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_id
+#: model:ir.model.fields,help:mail.field_mail_template__model_id
 msgid "The type of document this template can be used with"
 msgstr "该模板可使用的文档类型"
 
@@ -4877,14 +4730,14 @@ msgid "This"
 msgstr "此"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image
+#: model:ir.model.fields,help:mail.field_mail_channel__image
 msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
 msgstr "这个字段保存的图像作为群组的照片，限制为  1024x1024px."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_public
+#: model:ir.model.fields,help:mail.field_mail_channel__public
 msgid ""
 "This group is visible by non members. Invisible groups can add members "
 "through the invite button."
@@ -4896,20 +4749,20 @@ msgid "Thread"
 msgstr "线程"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_mail_email_to
+#: model:ir.model.fields,field_description:mail.field_mail_mail__email_to
 msgid "To"
 msgstr "至"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_to
-#: model:ir.model.fields,field_description:mail.field_mail_template_email_to
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__email_to
+#: model:ir.model.fields,field_description:mail.field_mail_template__email_to
 msgid "To (Emails)"
 msgstr "至（Email）"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_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
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__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)"
 msgstr "至（合作伙伴）"
 
@@ -4924,8 +4777,8 @@ msgstr "至:"
 #. module: mail
 #. openerp-web
 #: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:25
-#: code:addons/mail/static/src/js/thread.js:242
+#: code:addons/mail/static/src/js/activity.js:82
+#: code:addons/mail/static/src/js/thread.js:328
 #: code:addons/mail/static/src/xml/systray.xml:75
 #: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
 #: selection:hr.applicant,activity_state:0
@@ -4935,12 +4788,12 @@ msgstr "至:"
 #: 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:product.product,activity_state:0
 #: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
+#: selection:repair.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
@@ -4962,7 +4815,7 @@ msgstr "待办"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:35
+#: code:addons/mail/static/src/js/activity.js:92
 #, python-format
 msgid "Tomorrow"
 msgstr "明天"
@@ -4973,17 +4826,17 @@ msgid "Topics discussed in this group..."
 msgstr "在该群组中讨论的话题 ..."
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid ""
 "Tracked values are stored in a separate model. This field allow to "
 "reconstruct the tracking and to generate statistics on the model."
 msgstr "在单独的模型中存储跟踪值。该字段允许重建跟踪，以便在模型中生成统计数据。"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,field_description:mail.field_ir_model_fields__track_visibility
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Tracking"
 msgstr "追踪"
@@ -5001,28 +4854,28 @@ msgid "Tracking Values"
 msgstr "追踪值"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mail_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_mail_message_tracking_value_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__tracking_value_ids
 msgid "Tracking values"
 msgstr "追踪值"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_mail_message_type
-#: model:ir.model.fields,field_description:mail.field_mail_message_message_type
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_type
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_mail__message_type
+#: model:ir.model.fields,field_description:mail.field_mail_message__message_type
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_type
 msgid "Type"
 msgstr "类型"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_uuid
+#: model:ir.model.fields,field_description:mail.field_mail_channel__uuid
 msgid "UUID"
 msgstr "UUID"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:235
+#: code:addons/mail/models/mail_mail.py:233
 #, python-format
 msgid "Unable to connect to SMTP Server"
 msgstr "无法连接到 SMTP 服务器"
@@ -5035,7 +4888,6 @@ msgstr "无法发送电子邮件，请设定发送人的电子邮件地址。"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:700
 #: code:addons/mail/static/src/xml/followers.xml:22
 #, python-format
 msgid "Unfollow"
@@ -5048,143 +4900,145 @@ msgid ""
 msgstr "可惜 这个电子邮件别名已经被使用，请选择一个不一样的"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_unicode_source
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__unicode_source
 msgid "Unicode Character"
 msgstr "Unicode 字符"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread
 msgid "Unread Messages"
 msgstr "未读消息"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_event_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job_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_activity_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_product_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_project_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_task_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_event__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_note_note__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_product__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_product_template__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_project__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_task__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_users__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread_counter
 msgid "Unread Messages Counter"
 msgstr "未读消息计数器"
 
@@ -5195,61 +5049,61 @@ msgstr "未读信息"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all"
 msgstr "取消所有星标"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:135
 #, python-format
 msgid "Unstar all messages"
 msgstr "取消全部消息的星标"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe"
 msgstr "退订"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:136
 #, python-format
 msgid "Unsubscribe from channel"
 msgstr "退订频道"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:510
+#: code:addons/mail/models/mail_template.py:504
 #, python-format
 msgid "Unsupported report type %s found."
 msgstr "发现不支持的报告类型 %。"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:322
+#: code:addons/mail/static/src/xml/thread.xml:327
 #, python-format
 msgid "Uploading"
 msgstr "上传中"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:656
+#: code:addons/mail/static/src/js/composer.js:731
 #, python-format
 msgid "Uploading error"
 msgstr "上传错误"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_use_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_use_active_domain
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__use_active_domain
 msgid "Use active domain"
 msgstr "使用有效域"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_template_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_template_id
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__template_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__template_id
 msgid "Use template"
 msgstr "使用模版"
 
@@ -5259,7 +5113,7 @@ msgid "Use your own email servers"
 msgstr "使用你自己的邮件服务器"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_sequence
+#: model:ir.model.fields,help:mail.field_mail_message_subtype__sequence
 msgid "Used to order subtypes."
 msgstr "用于排序子类型。"
 
@@ -5272,7 +5126,7 @@ msgstr "用户"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:51
+#: code:addons/mail/static/src/xml/discuss.xml:51
 #: code:addons/mail/static/src/xml/extended_chat_window.xml:8
 #, python-format
 msgid "User name"
@@ -5284,7 +5138,7 @@ msgid "Users"
 msgstr "用户"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:711
+#: code:addons/mail/models/mail_channel.py:717
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "在此频道的用户 : %s %s 以及 你."
@@ -5300,14 +5154,14 @@ msgstr ""
 "(@mycompany.odoo.com)。"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:670
+#: code:addons/mail/models/mail_thread.py:696
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 #, python-format
 msgid "View"
 msgstr "查看"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:668
+#: code:addons/mail/models/mail_thread.py:694
 #, python-format
 msgid "View %s"
 msgstr "视图 %s"
@@ -5326,35 +5180,35 @@ msgstr ""
 " 你真的想要删除这个关注者吗 ?"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_model_object_field
-#: model:ir.model.fields,help:mail.field_mail_template_sub_model_object_field
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__sub_model_object_field
 msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
 msgstr "如果首先选择了一个关系型字段，这个字段可用于选择目标单据模型的目标字段。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_sub_object
-#: model:ir.model.fields,help:mail.field_mail_template_sub_object
+#: model:ir.model.fields,help:mail.field_email_template_preview__sub_object
+#: model:ir.model.fields,help:mail.field_mail_template__sub_object
 msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
 msgstr "如果关系型字段被选为第一个字段，这个字段显示这个关系指向的单据模型。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_fields_track_visibility
+#: model:ir.model.fields,help:mail.field_ir_model_fields__track_visibility
 msgid ""
 "When set, every modification to this field will be tracked in the chatter."
 msgstr "当设置完毕时，在聊天中，将追踪对该字段的每一次修改。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_is_log
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_is_log
+#: model:ir.model.fields,help:mail.field_mail_compose_message__is_log
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__is_log
 msgid "Whether the message is an internal note (comment mode only)"
 msgstr "该消息是否是一个内部备注(注释模式)"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_ir_model_is_mail_thread
+#: model:ir.model.fields,help:mail.field_ir_model__is_mail_thread
 msgid "Whether this model supports messages and notifications."
 msgstr ""
 
@@ -5372,54 +5226,54 @@ msgstr "写反馈"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:12
+#: code:addons/mail/static/src/xml/composer.xml:11
 #, python-format
-msgid "Write something..."
-msgstr "写些什么..."
+msgid "Write Something..."
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:29
-#: code:addons/mail/static/src/js/thread.js:244
+#: code:addons/mail/static/src/js/activity.js:86
+#: code:addons/mail/static/src/js/thread.js:330
 #, python-format
 msgid "Yesterday"
 msgstr "昨天"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:96
+#: code:addons/mail/static/src/js/discuss.js:98
 #, python-format
 msgid "You added <b>%s</b> to the conversation."
 msgstr "您添加了 <b>%s</b> 到对话。"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:708
+#: code:addons/mail/models/mail_channel.py:714
 #, python-format
 msgid "You are alone in this channel."
 msgstr "你是此频道的唯一人"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:677
+#: code:addons/mail/models/mail_channel.py:683
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "你在与<b>@%s</b> 的私有对话中"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:672
+#: code:addons/mail/models/mail_channel.py:678
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "你在频道 <b>#%s</b>"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:114
+#: code:addons/mail/static/src/xml/thread.xml:119
 #, python-format
 msgid ""
 "You can mark any message as 'starred', and it shows up in this channel."
 msgstr "你可以给所有的消息加星号，然后它就会显示在这个渠道中"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:54
+#: code:addons/mail/models/res_users.py:53
 #, python-format
 msgid ""
 "You cannot create a new user from here.\n"
@@ -5437,12 +5291,11 @@ msgid ""
 msgstr "你不能删除这些群组，因为整个公司群组被其它模块引用。"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:349
+#: code:addons/mail/models/mail_thread.py:342
 #, python-format
 msgid ""
-"You could also add a new %(document)s by sending an email to: "
-"%(email_link)s."
-msgstr "你可以通过发送邮件给%(email_link)s.来增加新的%(document)s"
+"You could also add a new %(document)s by sending an email to %(email_link)s"
+msgstr ""
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
@@ -5451,14 +5304,14 @@ msgstr "你被指派到"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/chat_manager.js:1446
 #, python-format
 msgid "You have been invited to: "
 msgstr "你已被邀请："
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_attachment_ids
-#: model:ir.model.fields,help:mail.field_mail_template_attachment_ids
+#: model:ir.model.fields,help:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_template__attachment_ids
 msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
@@ -5466,28 +5319,28 @@ msgstr "你可以对这个模版附加文件，可以附加到所有基于此模
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:473
+#: code:addons/mail/static/src/js/services/chat_manager.js:1536
 #, python-format
 msgid "You unpinned your conversation with <b>%s</b>."
 msgstr "你取消置顶你与<b>%s</b>的对话."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:471
+#: code:addons/mail/static/src/js/services/chat_manager.js:1534
 #, python-format
 msgid "You unsubscribed from <b>%s</b>."
 msgstr "你不再订阅<b>%s</b>。"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:217
+#: code:addons/mail/static/src/xml/discuss.xml:217
 #, python-format
 msgid "You:"
 msgstr "您："
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:92
 #, python-format
 msgid "Your message has not been sent."
 msgstr "您的短信尚未发送。"
@@ -5499,23 +5352,35 @@ msgid "Your template should define email_from"
 msgstr "你的模板需要定义email_from"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "alias %s: %s"
 msgstr "别名 %：%"
 
 #. module: mail
+#: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
+msgid "base.partner.merge.automatic.wizard"
+msgstr "base.partner.merge.automatic.wizard"
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "by"
 msgstr "by"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid ""
+"cannot be processed. This address\n"
+"    is used to collect replies and should not be used to directly contact"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "创建"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:315
+#: code:addons/mail/models/mail_thread.py:309
 #, python-format
 msgid "document"
 msgstr "单据"
@@ -5534,7 +5399,7 @@ msgstr "例如.讨论提案"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:11
 #, python-format
 msgid "enable desktop notifications"
 msgstr "启用桌面通知"
@@ -5569,13 +5434,13 @@ msgid "has been"
 msgstr "已经"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:282
+#: code:addons/mail/models/mail_alias.py:271
 #, python-format
 msgid "incorrectly configured alias"
 msgstr "不正确配置的别名"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:278
+#: code:addons/mail/models/mail_alias.py:267
 #, python-format
 msgid "incorrectly configured alias (unknown reference record)"
 msgstr "错误地别名配置（未知参考记录）"
@@ -5596,19 +5461,19 @@ msgid "mail.alias.mixin"
 msgstr "mail.alias.mixin"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:943
+#: code:addons/mail/models/mail_thread.py:925
 #, python-format
 msgid "model %s does not accept document creation"
 msgstr "模型 % 不接受文档创建"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:938
+#: code:addons/mail/models/mail_thread.py:920
 #, python-format
 msgid "model %s does not accept document update"
 msgstr "模型 % 不接受文档更新"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:931
+#: code:addons/mail/models/mail_thread.py:913
 #, python-format
 msgid ""
 "model %s does not accept document update, fall back on document creation"
@@ -5633,14 +5498,14 @@ msgstr "现在"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:177
+#: code:addons/mail/static/src/xml/thread.xml:181
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "on"
 msgstr "在"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid ""
 "posting a message without model should be with a null res_id (private "
@@ -5648,7 +5513,7 @@ msgid ""
 msgstr "发布无模型消息应使用无效 res_id（私人信息），收到 %"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:917
+#: code:addons/mail/models/mail_thread.py:899
 #, python-format
 msgid ""
 "posting a message without model should be with a parent_id (private message)"
@@ -5679,13 +5544,13 @@ msgid "record:"
 msgstr "记录："
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:935
+#: code:addons/mail/models/mail_thread.py:917
 #, python-format
 msgid "reply to missing document (%s,%s)"
 msgstr "对缺失文档的回复 (%,%)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:928
+#: code:addons/mail/models/mail_thread.py:910
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
 msgstr "对丢失文档的回复 (%,%)，在新文档创建中退回"
@@ -5696,40 +5561,45 @@ msgid "res.config.settings"
 msgstr "设置-基础设置"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:895
 #, python-format
 msgid "resetting thread_id"
 msgstr "重新设置 thread_id"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:254
+#: code:addons/mail/models/mail_channel.py:252
 #, python-format
 msgid "restricted to channel members"
 msgstr "仅限于频道成员"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:287
+#: code:addons/mail/models/mail_alias.py:276
 #, python-format
 msgid "restricted to followers"
 msgstr "仅限于关注者"
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:291
+#: code:addons/mail/models/mail_alias.py:280
 #, python-format
 msgid "restricted to known authors"
 msgstr "仅限于已知的作者"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:899
 #: code:addons/mail/models/mail_thread.py:917
-#: code:addons/mail/models/mail_thread.py:935
-#: code:addons/mail/models/mail_thread.py:938
-#: code:addons/mail/models/mail_thread.py:943
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:920
+#: code:addons/mail/models/mail_thread.py:925
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "skipping"
 msgstr "跳过"
 
 #. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "team."
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/chatter.xml:20
 #, python-format
@@ -5737,13 +5607,18 @@ msgid "this document"
 msgstr "此单据"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: code:addons/mail/models/mail_thread.py:948
 #, python-format
 msgid "unknown error"
 msgstr "未知错误"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:906
+#: code:addons/mail/models/mail_thread.py:888
 #, python-format
 msgid "unknown target model %s"
 msgstr "位置目标模型 %s"
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_notification_email
+msgid "using"
+msgstr ""