[I18N] Update translation terms from Transifex

28 files changed, 6742 insertions, 5633 deletions

diff --git a/addons/mail/i18n/ar.po b/addons/mail/i18n/ar.po
index 3823f2dad03..5ea9c27d860 100644
--- a/addons/mail/i18n/ar.po
+++ b/addons/mail/i18n/ar.po
@@ -30,10 +30,10 @@
 # Ali Alrehawi <alrehawi@hotmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Ali Alrehawi <alrehawi@hotmail.com>, 2018\n"
 "Language-Team: Arabic (https://www.transifex.com/odoo/teams/41243/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -156,21 +156,7 @@ msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -181,7 +167,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -190,7 +176,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -198,8 +184,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -732,7 +718,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -1277,7 +1263,7 @@ msgstr "وضع التحرير"
 #. module: mail
 #: model:ir.model,name:mail.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "ضبط الإعدادات"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
@@ -2292,8 +2278,9 @@ msgid "Guidelines"
 msgstr "الإرشادات"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2340,6 +2327,7 @@ msgstr "ترويسات"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2574,7 +2562,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2828,7 +2817,7 @@ msgstr "مغادرة"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2847,7 +2836,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
@@ -4115,6 +4104,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4767,7 +4761,7 @@ msgstr ""
 "عرض كافة السجلات التي تاريخ الإجراء التالي فيها يسبق تاريخ اليوم الجاري"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr ""
@@ -5470,7 +5464,7 @@ msgid "Users"
 msgstr "المستخدمون"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5619,7 +5613,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr ""
@@ -5653,13 +5647,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr ""
@@ -5820,6 +5814,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "اجتماعات مجلس الإدارة"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5835,6 +5834,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr ""
@@ -5985,6 +5989,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6040,6 +6049,11 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "مبيعات"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/bs.po b/addons/mail/i18n/bs.po
index e6bb5f1c5fe..8ad8e7345e1 100644
--- a/addons/mail/i18n/bs.po
+++ b/addons/mail/i18n/bs.po
@@ -8,10 +8,10 @@
 # Bole <bole@dajmi5.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Bole <bole@dajmi5.com>, 2018\n"
 "Language-Team: Bosnian (https://www.transifex.com/odoo/teams/41243/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ 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
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -135,21 +135,7 @@ msgid "0 Today"
 msgstr "0 Danas"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -160,7 +146,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -169,7 +155,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -179,8 +165,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -737,7 +723,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2319,8 +2305,9 @@ msgid "Guidelines"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2367,6 +2354,7 @@ msgstr "Zaglavlja"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2603,7 +2591,8 @@ msgstr ""
 "'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2857,7 +2846,7 @@ msgstr "Napusti"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2876,7 +2865,7 @@ msgid ""
 msgstr "Lista partnera koji će biti dodani kao pratioci trenutnog dokumenta."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr "Izlistaj korisnike u trenutnom kanalu"
@@ -4171,6 +4160,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4823,7 +4817,7 @@ msgid "Show all records which has next action date is before today"
 msgstr "Prikaži sve zapise koji imaju datum sljedeće akcije prije danas"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "Prikaži pomoćnu poruku"
@@ -5527,7 +5521,7 @@ msgid "Users"
 msgstr "Korisnici"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Korisnici u ovom kanalu: %s %s i vi."
@@ -5676,7 +5670,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr "Dodali ste <b>%s</b> razgovoru."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Sami ste na ovom kanalu."
@@ -5710,13 +5704,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "U privatnom ste razgovoru sa <b>@%s</b>."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Nalazite se u kanalu <b>#%s</b>."
@@ -5882,6 +5876,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "sastanci rukovodstva"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5897,6 +5896,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "kreiran"
@@ -6055,6 +6059,11 @@ msgstr ""
 "poruka)"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6112,6 +6121,11 @@ msgid "restricted to known authors"
 msgstr "ograničeno na poznate autore"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "prodaje"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/cs.po b/addons/mail/i18n/cs.po
index 2f6c9210765..cd9fc18d650 100644
--- a/addons/mail/i18n/cs.po
+++ b/addons/mail/i18n/cs.po
@@ -11,10 +11,10 @@
 # Jakub Lohnisky <jakub@lepremier.cz>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Jakub Lohnisky <jakub@lepremier.cz>, 2018\n"
 "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -138,21 +138,7 @@ msgid "0 Today"
 msgstr "Dnes 0"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -163,7 +149,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -172,7 +158,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -180,8 +166,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -720,7 +706,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2295,8 +2281,9 @@ msgid "Guidelines"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2343,6 +2330,7 @@ msgstr "Hlavičky"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2581,7 +2569,8 @@ msgstr ""
 "\"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2835,7 +2824,7 @@ msgstr "Uvolnění"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2854,7 +2843,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
@@ -3737,7 +3726,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_has_error_counter
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_has_error_counter
 msgid "Number of error"
-msgstr ""
+msgstr "Počet chyb"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_blacklist__message_needaction_counter
@@ -4139,6 +4128,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4789,7 +4783,7 @@ msgstr ""
 "Zobrazit všechny záznamy, které mají následující datum akce před dneškem"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr ""
@@ -5506,7 +5500,7 @@ msgid "Users"
 msgstr "Uživatelé"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5655,7 +5649,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr ""
@@ -5689,13 +5683,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr ""
@@ -5857,6 +5851,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5872,6 +5871,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "vytvořeno"
@@ -6022,6 +6026,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6077,6 +6086,11 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po
index 3825eb31b31..beab0ff56e9 100644
--- a/addons/mail/i18n/de.po
+++ b/addons/mail/i18n/de.po
@@ -8,13 +8,15 @@
 # Tina Rittmüller <tr@ife.de>, 2018
 # darenkster <inactive+darenkster@transifex.com>, 2018
 # Johannes Croe <jcr@odoo.com>, 2018
+# Ralf Hilgenstock <rh@dialoge.info>, 2018
+# Anja Funk <anja.funk@afimage.de>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
-"Last-Translator: Johannes Croe <jcr@odoo.com>, 2018\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
+"Last-Translator: Anja Funk <anja.funk@afimage.de>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, 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."
@@ -136,21 +138,7 @@ msgid "0 Today"
 msgstr "0 Heute"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -166,7 +154,7 @@ msgstr ""
 "            Fügen Sie in Ihre Nachricht vorbereitete Antworten mit <b>:tastaturkürzel</b> ein.<br>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -175,7 +163,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -185,8 +173,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -762,7 +750,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2351,8 +2339,9 @@ msgid "Guidelines"
 msgstr "Leitfaden"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2399,6 +2388,7 @@ msgstr "Kopftexte"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2653,7 +2643,8 @@ msgstr ""
 "werden, z.B. \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2909,7 +2900,7 @@ msgstr "Urlaub"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2932,7 +2923,7 @@ msgstr ""
 "werden."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr "Benutzer im aktuellen Channel auflisten"
@@ -4238,6 +4229,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4896,7 +4892,7 @@ 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:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "mehr Nachrichten anzeigen"
@@ -5626,7 +5622,7 @@ msgid "Users"
 msgstr "Benutzer"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Benutzer in diesem Kanal: %s %s und du "
@@ -5785,7 +5781,7 @@ 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:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Sie sind allein in diesem Kanal."
@@ -5819,13 +5815,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, 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:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Sie befinden sich im Kanal <b>#%s</b>."
@@ -5991,6 +5987,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "Vorstandssitzungen"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -6006,6 +6007,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "angelegt"
@@ -6164,6 +6170,11 @@ msgstr ""
 "(private Mitteilung) erfolgen."
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "rd"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6219,6 +6230,11 @@ msgid "restricted to known authors"
 msgstr "beschränkt auf unbekannte Autoren"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "Verkauf"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/el.po b/addons/mail/i18n/el.po
index e8dd78d2bd7..8b92835736d 100644
--- a/addons/mail/i18n/el.po
+++ b/addons/mail/i18n/el.po
@@ -11,10 +11,10 @@
 # Vasilis Dimopoulos <iap3tos@outlook.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Vasilis Dimopoulos <iap3tos@outlook.com>, 2018\n"
 "Language-Team: Greek (https://www.transifex.com/odoo/teams/41243/el/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -139,21 +139,7 @@ msgid "0 Today"
 msgstr "0 Σημερινά"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -164,7 +150,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -173,7 +159,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -183,8 +169,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -758,7 +744,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2360,8 +2346,9 @@ msgid "Guidelines"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2408,6 +2395,7 @@ msgstr "Κεφαλίδες"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2657,7 +2645,8 @@ msgstr ""
 "στο λεξικό ορισμών της python π.χ. \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2913,7 +2902,7 @@ msgstr "Αποχώρηση"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2934,7 +2923,7 @@ msgstr ""
 "Λίστα των συνεργατών που θα προστεθούν ως ακόλουθοι του τρέχοντος εγγράφου."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr "Λίστα χρηστών στο τρέχον κανάλι"
@@ -4244,6 +4233,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4906,7 +4900,7 @@ msgstr ""
 "σήμερα"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "Εμφάνιση βοηθητικού μηνύματος"
@@ -5629,7 +5623,7 @@ msgid "Users"
 msgstr "Χρήστες"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Χρήστες αυτού του καναλιού: %s %s και εσείς."
@@ -5790,7 +5784,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr "Έχετε προστεθεί <b>%s</b> στη συνομιλία."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Είστε μόνος/η σε αυτό το κανάλι."
@@ -5824,13 +5818,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, 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:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Είστε στο κανάλι <b>#%s</b>."
@@ -5996,6 +5990,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "πίνακας-συναντήσεων"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -6011,6 +6010,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "δημιουργήθηκε"
@@ -6169,6 +6173,11 @@ msgstr ""
 " (ιδιωτικό μήνυμα)"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "rd"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6226,6 +6235,11 @@ msgid "restricted to known authors"
 msgstr "περιορίζεται στους γνωστούς συγγραφείς"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "πωλήσεις"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po
index 53344a8b230..4f64c620bf3 100644
--- a/addons/mail/i18n/es.po
+++ b/addons/mail/i18n/es.po
@@ -8,13 +8,15 @@
 # Nicolás Broggi <rnbroggi@gmail.com>, 2018
 # Cristopher Cravioto <ccr@odoo.com>, 2018
 # Miquel Torner <miq@odoo.com>, 2018
+# Cristian Salamea <ovnicraft@gmail.com>, 2018
+# RGB Consulting <odoo@rgbconsulting.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
-"Last-Translator: Miquel Torner <miq@odoo.com>, 2018\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
+"Last-Translator: RGB Consulting <odoo@rgbconsulting.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"
@@ -23,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, 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."
@@ -136,21 +138,7 @@ msgid "0 Today"
 msgstr "0 hoy"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -161,7 +149,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -170,7 +158,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -180,8 +168,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -565,7 +553,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_mail__add_sign
 #: model:ir.model.fields,field_description:mail.field_mail_message__add_sign
 msgid "Add Sign"
-msgstr ""
+msgstr "Agregar Signo"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
@@ -751,7 +739,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2345,8 +2333,9 @@ msgid "Guidelines"
 msgstr "Lineamientos"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2393,6 +2382,7 @@ msgstr "Cabeceras"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2645,7 +2635,8 @@ msgstr ""
 "'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2901,7 +2892,7 @@ msgstr "Ausencia"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2922,7 +2913,7 @@ msgstr ""
 "Lista de empresas que serán añadidas como seguidoras del documento actual."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr "Listado actual de usuarios en este canal"
@@ -4233,6 +4224,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4895,7 +4891,7 @@ msgstr ""
 "hoy"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "Mostrar un mensaje de ayuda"
@@ -5627,7 +5623,7 @@ msgid "Users"
 msgstr "Usuarios"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Usuarios en este canal: %s %s y usted."
@@ -5785,7 +5781,7 @@ 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:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Está solo en este canal."
@@ -5819,13 +5815,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, 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:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Esta en el canal <b>#%s</b>."
@@ -5991,6 +5987,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "tablero de citas"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -6006,6 +6007,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "creado"
@@ -6164,6 +6170,11 @@ msgstr ""
 "privado"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "rd"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6221,6 +6232,11 @@ msgid "restricted to known authors"
 msgstr "restringido a autores conocidos"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "ventas"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/fa.po b/addons/mail/i18n/fa.po
index 9891d389a64..6598f60d771 100644
--- a/addons/mail/i18n/fa.po
+++ b/addons/mail/i18n/fa.po
@@ -18,10 +18,10 @@
 # Arash Sardari <arashss77@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Arash Sardari <arashss77@gmail.com>, 2018\n"
 "Language-Team: Persian (https://www.transifex.com/odoo/teams/41243/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr "این کانال خصوصی است. افراد باید دعوت شوند تا به گفتگو بپیوندند."
@@ -144,21 +144,7 @@ msgid "0 Today"
 msgstr "0 امروز"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -169,7 +155,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -178,7 +164,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -188,8 +174,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -728,7 +714,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2282,8 +2268,9 @@ msgid "Guidelines"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2330,6 +2317,7 @@ msgstr "سرآیندها"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2566,7 +2554,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2820,7 +2809,7 @@ msgstr "ترک"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2839,7 +2828,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
@@ -4102,6 +4091,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4747,7 +4741,7 @@ msgid "Show all records which has next action date is before today"
 msgstr "تمام رکوردهایی که تاریخ اعمال بعدی قبل از امروز است را نشان بده"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr ""
@@ -5435,7 +5429,7 @@ msgid "Users"
 msgstr "کاربران"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5580,7 +5574,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr ""
@@ -5614,13 +5608,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, 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:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "شما در کانال <b>#%s</b>هستید."
@@ -5780,6 +5774,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5795,6 +5794,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr ""
@@ -5945,6 +5949,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6000,6 +6009,11 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po
index 75beabddf68..81063c84dca 100644
--- a/addons/mail/i18n/fi.po
+++ b/addons/mail/i18n/fi.po
@@ -23,10 +23,10 @@
 # Teemu Ahonen <teemu.ahonen@web-veistamo.fi>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Teemu Ahonen <teemu.ahonen@web-veistamo.fi>, 2018\n"
 "Language-Team: Finnish (https://www.transifex.com/odoo/teams/41243/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -151,21 +151,7 @@ msgid "0 Today"
 msgstr "0 Tänään"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -176,7 +162,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -185,7 +171,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -195,8 +181,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -742,7 +728,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2315,8 +2301,9 @@ msgid "Guidelines"
 msgstr "Ohjesäännöt"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2363,6 +2350,7 @@ msgstr "Otsakkeet"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2606,7 +2594,8 @@ msgstr ""
 "dictionary, esim. \"{'kentta': 'arvo'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2860,7 +2849,7 @@ msgstr "Poissaolo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2879,7 +2868,7 @@ msgid ""
 msgstr "Lista kumppaneista, jotka lisätään kyseisen dokumentin seuraajiksi."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
@@ -4148,6 +4137,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4793,7 +4787,7 @@ msgid "Show all records which has next action date is before today"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr ""
@@ -5489,7 +5483,7 @@ msgid "Users"
 msgstr "Käyttäjät"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5634,7 +5628,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr ""
@@ -5668,13 +5662,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr ""
@@ -5836,6 +5830,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5851,6 +5850,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "loi"
@@ -6001,6 +6005,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6056,6 +6065,11 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 22d85efcdb9..dfac2860d14 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -13,13 +13,15 @@
 # Laura Piraux <lap@odoo.com>, 2018
 # Christophe CHAUVET <christophe.chauvet@gmail.com>, 2018
 # Marie Willemyns <mwi@odoo.com>, 2018
+# Quentin THEURET <odoo@kerpeo.com>, 2018
+# Julien Martin <204336@supinfo.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
-"Last-Translator: Marie Willemyns <mwi@odoo.com>, 2018\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
+"Last-Translator: Julien Martin <204336@supinfo.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"
@@ -28,7 +30,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, 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."
@@ -141,30 +143,7 @@ msgid "0 Today"
 msgstr "0 aujourd'hui"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Bonjour ${object.name or ''},</p>\n"
-"<p>Vous trouverez ci-dessous les lignes de conduite du canal ${ctx['channel'].name}.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -180,7 +159,7 @@ msgstr ""
 "            Tappez <b>:raccourci</b> pour insérer une réponse automatique à votre message.<br>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -192,7 +171,7 @@ msgstr ""
 "id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -202,8 +181,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -783,7 +762,7 @@ msgstr "Une erreur est survenue lors de l'envoi d'un email "
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2384,9 +2363,10 @@ msgid "Guidelines"
 msgstr "Directives"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
-msgstr "Guidelines du canal ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
+msgstr ""
 
 #. module: mail
 #: selection:res.users,notification_type:0
@@ -2432,6 +2412,7 @@ msgstr "En-têtes"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr "Bonjour"
 
@@ -2687,7 +2668,8 @@ msgstr ""
 "attendue, par exemple \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2943,7 +2925,7 @@ msgstr "Congé"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2966,7 +2948,7 @@ msgstr ""
 "actuel."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr "Répertorier les utilisateur dans le canal actuel"
@@ -4283,6 +4265,11 @@ msgid "Please contact us instead using"
 msgstr "Merci de nous contacter plutôt que d'utiliser"
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4947,7 +4934,7 @@ msgstr ""
 "actions est pour aujourd'hui ou avant. "
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "Montrer un message d'aide"
@@ -5683,7 +5670,7 @@ msgid "Users"
 msgstr "Utilisateurs"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Utilisateurs dans ce canal: %s %s et vous."
@@ -5839,7 +5826,7 @@ 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:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Vous êtes seul dans ce canal."
@@ -5875,13 +5862,13 @@ msgstr ""
 "vous cette action?"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, 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:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Vous êtes dans le salon <b>#%s</b>."
@@ -6051,6 +6038,11 @@ msgid "assigned you an activity"
 msgstr "vous a assigné une activité"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "Réunions"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -6066,6 +6058,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "créé"
@@ -6225,6 +6222,11 @@ msgstr ""
 "(message privé)"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "r&d"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6281,6 +6283,11 @@ msgid "restricted to known authors"
 msgstr "limité aux auteurs connus"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "ventes"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/gu.po b/addons/mail/i18n/gu.po
index 6c65ebf5f11..31b9e1af222 100644
--- a/addons/mail/i18n/gu.po
+++ b/addons/mail/i18n/gu.po
@@ -11,10 +11,10 @@
 # Spellbound Soft Solutions <jeel.spellbound@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Spellbound Soft Solutions <jeel.spellbound@gmail.com>, 2018\n"
 "Language-Team: Gujarati (https://www.transifex.com/odoo/teams/41243/gu/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -137,21 +137,7 @@ msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -162,7 +148,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -171,7 +157,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -179,8 +165,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -713,7 +699,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2267,8 +2253,9 @@ msgid "Guidelines"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2315,6 +2302,7 @@ msgstr ""
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2549,7 +2537,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2803,7 +2792,7 @@ msgstr "છોડો"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2822,7 +2811,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
@@ -4085,6 +4074,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4730,7 +4724,7 @@ msgid "Show all records which has next action date is before today"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr ""
@@ -5418,7 +5412,7 @@ msgid "Users"
 msgstr "વપરાશકર્તાઓ"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5563,7 +5557,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr ""
@@ -5597,13 +5591,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr ""
@@ -5763,6 +5757,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5778,6 +5777,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr ""
@@ -5928,6 +5932,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -5983,6 +5992,11 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/he.po b/addons/mail/i18n/he.po
index b387db668ab..70cd439ef9c 100644
--- a/addons/mail/i18n/he.po
+++ b/addons/mail/i18n/he.po
@@ -13,10 +13,10 @@
 # Leandro Noijovich <eliel.sorcerer@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Leandro Noijovich <eliel.sorcerer@gmail.com>, 2018\n"
 "Language-Team: Hebrew (https://www.transifex.com/odoo/teams/41243/he/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -139,21 +139,7 @@ msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -164,7 +150,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -173,7 +159,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -181,8 +167,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -715,7 +701,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2269,8 +2255,9 @@ msgid "Guidelines"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2317,6 +2304,7 @@ msgstr ""
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2551,7 +2539,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2805,7 +2794,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2824,7 +2813,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
@@ -4087,6 +4076,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4732,7 +4726,7 @@ msgid "Show all records which has next action date is before today"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr ""
@@ -5420,7 +5414,7 @@ msgid "Users"
 msgstr "משתמשים"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5565,7 +5559,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr ""
@@ -5599,13 +5593,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr ""
@@ -5765,6 +5759,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5780,6 +5779,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr ""
@@ -5930,6 +5934,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -5985,6 +5994,11 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po
index 843720f06fd..e5fb1e5de9d 100644
--- a/addons/mail/i18n/it.po
+++ b/addons/mail/i18n/it.po
@@ -29,10 +29,10 @@
 # Romica Paun <roa@odoo.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Romica Paun <roa@odoo.com>, 2018\n"
 "Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -156,30 +156,7 @@ msgid "0 Today"
 msgstr "0 Oggi"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Buongiorno ${object.name or ''},</p>\n"
-"<p>Di seguito sono riportate le linee guida del canale ${ctx['channel'].name}.\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -195,7 +172,7 @@ msgstr ""
 "            Scrivi <b>:scorciatoia</b> per inserire risposte predefinite nel tuo messaggio.<br>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -207,7 +184,7 @@ msgstr ""
 "id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -217,8 +194,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -804,7 +781,7 @@ msgstr "Si è verificato un errore durante l'invio di una email"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2398,9 +2375,10 @@ msgid "Guidelines"
 msgstr "Linee guida"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
-msgstr "Linee guida del canale ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
+msgstr ""
 
 #. module: mail
 #: selection:res.users,notification_type:0
@@ -2446,6 +2424,7 @@ msgstr "Intestazioni"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr "Buongiorno"
 
@@ -2702,7 +2681,8 @@ msgstr ""
 "\"{'field':'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2823,7 +2803,7 @@ msgstr "È moderatore"
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
 msgid "Is pinned on the interface"
-msgstr "È appuntato sull'interfaccia"
+msgstr "È fissato sull'interfaccia"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_kanban
@@ -2958,7 +2938,7 @@ msgstr "Permesso"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2979,7 +2959,7 @@ msgstr ""
 "Lista di partner che verranno aggiunti come followers al documento corrente."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr "Elencare gli utenti nel canale attuale"
@@ -4293,6 +4273,11 @@ msgid "Please contact us instead using"
 msgstr "Contattaci invece di usare"
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4957,7 +4942,7 @@ msgstr ""
 "Mostra tutti i record che hanno la prossima data dell’azione è prima di oggi"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "Mostra un messaggio d'aiuto"
@@ -5614,7 +5599,7 @@ msgstr "Unsupported report type %s found."
 #: code:addons/mail/models/mail_message.py:188
 #, python-format
 msgid "Unsupported search filter on moderation status"
-msgstr ""
+msgstr "Filtro di ricerca non supportato per lo stato di moderazione"
 
 #. module: mail
 #: selection:ir.actions.server,state:0
@@ -5702,7 +5687,7 @@ msgid "Users"
 msgstr "Utenti"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Utenti in questo canale: %s %s e tu."
@@ -5859,7 +5844,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr "Hai aggiunto <b>%s</b> alla conversazione."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Sei da solo in questo canale"
@@ -5895,13 +5880,13 @@ msgstr ""
 " azione? "
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "Sei in una conversazione privata con  <b>@%s</b>."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Sei nel canale <b>#%s</b>."
@@ -5986,7 +5971,7 @@ msgstr ""
 #: code:addons/mail/static/src/js/services/mail_notification_manager.js:444
 #, python-format
 msgid "You unpinned your conversation with <b>%s</b>."
-msgstr ""
+msgstr "Hai rimosso la puntina per la tua conversazione con <b>%s</b>."
 
 #. module: mail
 #. openerp-web
@@ -6006,7 +5991,7 @@ msgstr "Tu:"
 #: model_terms:ir.ui.view,arch_db:mail.mail_notification_light
 #: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
 msgid "Your"
-msgstr ""
+msgstr "Il tuo"
 
 #. module: mail
 #. openerp-web
@@ -6020,14 +6005,14 @@ msgstr "Il tuo messaggio non è stato inviato."
 #: code:addons/mail/static/src/xml/thread.xml:424
 #, python-format
 msgid "Your message is pending moderation"
-msgstr ""
+msgstr "Il tuo messaggio è in attesa di moderazione"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/discuss.xml:198
 #, python-format
 msgid "Your message was rejected by moderator."
-msgstr ""
+msgstr "Il tuo messaggio è stato rifiutato dal moderatore."
 
 #. module: mail
 #: code:addons/mail/models/ir_actions.py:57
@@ -6040,24 +6025,24 @@ msgstr "Il tuo template dovrebbe specificare un campo email_from"
 #: code:addons/mail/static/src/xml/thread.xml:68
 #, python-format
 msgid "Zoom In"
-msgstr ""
+msgstr "Ingrandisci"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:70
 #, python-format
 msgid "Zoom Out"
-msgstr ""
+msgstr "Riduci"
 
 #. module: mail
 #: selection:mail.activity.type,delay_from:0
 msgid "after previous activity deadline"
-msgstr ""
+msgstr "dopo la scadenza dell'attività precedente"
 
 #. module: mail
 #: selection:mail.activity.type,delay_from:0
 msgid "after validation date"
-msgstr ""
+msgstr "dopo la data di convalida"
 
 #. module: mail
 #: code:addons/mail/models/mail_thread.py:1074
@@ -6068,7 +6053,12 @@ msgstr "alias %s: %s"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_activity_assigned
 msgid "assigned you an activity"
-msgstr ""
+msgstr "ti ha assegnato un'attività"
+
+#. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "Riunioni del board"
 
 #. module: mail
 #. openerp-web
@@ -6084,6 +6074,13 @@ msgid ""
 "cannot be processed. This address\n"
 "    is used to collect replies and should not be used to directly contact"
 msgstr ""
+"non può essere trattato. Questo indirizzo\n"
+"    è usato per raccogliere le risposte e non deve essere usato per contattare direttamente"
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
@@ -6115,7 +6112,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/thread.xml:45
 #, python-format
 msgid "e.g. 1-5, 7, 8-9"
-msgstr ""
+msgstr "esempio: 1-5, 7, 8-9"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
@@ -6162,7 +6159,7 @@ msgstr "alias scorrettamente configurato"
 #: code:addons/mail/models/mail_alias.py:268
 #, python-format
 msgid "incorrectly configured alias (unknown reference record)"
-msgstr ""
+msgstr "alias scorrettamente configurato (record di riferimento sconosciuto)"
 
 #. module: mail
 #: code:addons/mail/models/mail_thread.py:1051
@@ -6244,6 +6241,11 @@ msgstr ""
 "privato)"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6300,6 +6302,11 @@ msgid "restricted to known authors"
 msgstr "restricted to known authors"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "vendite"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
@@ -6312,7 +6319,7 @@ msgstr "ignora"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 msgid "team."
-msgstr ""
+msgstr "team."
 
 #. module: mail
 #. openerp-web
@@ -6346,4 +6353,4 @@ msgstr ""
 #. module: mail
 #: selection:mail.activity.type,delay_unit:0
 msgid "weeks"
-msgstr ""
+msgstr "settimane"
diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po
index 436c7fa3474..01614df03a8 100644
--- a/addons/mail/i18n/ja.po
+++ b/addons/mail/i18n/ja.po
@@ -3,22 +3,24 @@
 # * mail
 # 
 # Translators:
-# Yoshi Tashiro <tashiro@roomsfor.hk>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2017
-# 高木正勝 <masakatsu.takagi@pro-spire.co.jp>, 2017
-# SHIMIZU Taku <shimizu.taku@gmail.com>, 2017
-# Manami Hashi <manami@roomsfor.hk>, 2017
-# NOKA Shigekazu <shigekazu.noka@gmail.com>, 2017
-# kent_ocean <ke.tanabe@gmail.com>, 2017
-# Takahiro MURAKAMI <murakami@date-yakkyoku.com>, 2017
+# SHIMIZU Taku <shimizu.taku@gmail.com>, 2018
+# Martin Trigaux, 2018
+# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018
+# NOKA Shigekazu <shigekazu.noka@gmail.com>, 2018
+# 高木正勝 <masakatsu.takagi@pro-spire.co.jp>, 2018
+# Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018
+# 前園義博 <yoshihiro.maezono@pro-spire.co.jp>, 2018
+# 城谷 龍弥 <tatsuya.shirotani@pro-spire.co.jp>, 2018
+# kent_ocean <ke.tanabe@gmail.com>, 2018
+# Manami Hashi <manami@roomsfor.hk>, 2018
+# Tim Siu Lai <tl@roomsfor.hk>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
-"PO-Revision-Date: 2017-11-30 13:11+0000\n"
-"Last-Translator: Takahiro MURAKAMI <murakami@date-yakkyoku.com>, 2017\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
+"Last-Translator: Tim Siu Lai <tl@roomsfor.hk>, 2018\n"
 "Language-Team: Japanese (https://www.transifex.com/odoo/teams/41243/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,226 +29,140 @@ 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 ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:674
+#: code:addons/mail/models/mail_channel.py:921
 #, 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/mail_manager.js:945
 #, python-format
 msgid "%d Messages"
 msgstr "%d メッセージ"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:32
+#: code:addons/mail/static/src/js/activity.js:89
 #, python-format
 msgid "%d days overdue"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:248
+#: code:addons/mail/models/mail_template.py:249
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (コピー)"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:236
+#. openerp-web
+#: code:addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js:133
+#, python-format
+msgid "%s and %s are typing..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:278
 #, python-format
 msgid "%s created"
 msgstr "%s 登録"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:77
+#. openerp-web
+#: code:addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js:131
 #, python-format
-msgid "%s has joined the %s network."
-msgstr "%s が %s ネットワークに參加しました。"
+msgid "%s is typing..."
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:211
+#: code:addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js:137
 #, python-format
-msgid "&nbsp;("
+msgid "%s, %s and more are typing..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_activity.py:341
+#, python-format
+msgid "%s: %s assigned to you"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
+msgid "&amp;nbsp;"
+msgstr "&amp;nbsp;"
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:179
+#: code:addons/mail/static/src/xml/discuss.xml:285
 #, python-format
-msgid "(from"
+msgid "&nbsp;("
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_shortcode_type
-msgid ""
-"* Smiley are only used for HTML code to display an image * Text (default "
-"value) is used to substitute text with another text"
-msgstr "*スマイリーは画像を表示するためのHTMLコードにのみ使用されます*テキスト(デフォルト値)は別のテキストと置き換えるために使用されます"
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:326
+#, python-format
+msgid "(from"
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:49
+#: code:addons/mail/static/src/xml/activity.xml:56
 #, python-format
 msgid ", due on"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:331
+#: code:addons/mail/static/src/xml/thread.xml:547
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr "-------- 以前のメッセージを表示 --------"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:78
+#: code:addons/mail/static/src/xml/systray.xml:99
 #, python-format
 msgid "0 Future"
 msgstr "0 将来"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:74
+#: code:addons/mail/static/src/xml/systray.xml:95
 #, python-format
 msgid "0 Late"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:76
+#: code:addons/mail/static/src/xml/systray.xml:97
 #, python-format
 msgid "0 Today"
 msgstr "0 本日"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
-"            You can mention someone by typing <b>@username</b>, this will grab its attention.<br>\n"
-"            You can mention a channel by typing <b>#channel</b>.<br>\n"
-"            You can execute a command by typing <b>/command</b>.<br>\n"
-"            You can insert canned responses in your message by typing <b>:shortcut</b>.<br>"
+"            Type <b>@username</b> to mention someone, and grab his attention.<br>\n"
+"            Type <b>#channel</b>.to mention a channel.<br>\n"
+"            Type <b>/command</b> to execute a command.<br>\n"
+"            Type <b>:shortcut</b> to insert canned responses in your message.<br>"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:721
+#, 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 ""
-"<br><br>\n"
-"            <b> @username </b>と入力すると誰かに言及することができます。これは注目に値するでしょう。<br>\n"
-"            <b>#channel </b>と入力すると、チャネルを指定できます。<br>\n"
-"            <b>/command</b>と入力すると、コマンドを実行できます。<br>\n"
-"            <b>:shortcut</b>と入力すると、メッセージに缶詰応答を挿入できます。<br>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:584
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -256,8 +172,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:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -267,7 +183,7 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:182
+#: code:addons/mail/models/mail_channel.py:294
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">left <a href=\"#\" "
@@ -327,6 +243,13 @@ msgstr ""
 "<p><b>最初のチャンネルを作成</b>を、してみて下さい(例：セールス、マーケティング、プロダクトXYZ、ワーキングパーティーなど)</p>"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/models/threads/create_mode_document_thread.js:65
+#, python-format
+msgid "<p>Creating a new record...</p>"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<span attrs=\"{'invisible': [('composition_mode', '!=', 'mass_mail')]}\">\n"
@@ -334,14 +257,8 @@ msgid ""
 "                                <span attrs=\"{'invisible': [('use_active_domain', '=', True)]}\">the selected records</span>\n"
 "                                <span attrs=\"{'invisible': [('use_active_domain', '=', False)]}\">the current search filter</span>.\n"
 "                            </span>\n"
-"                            <span attrs=\"{'invisible':['|', ('model', '=', False), ('composition_mode', '=', 'mass_mail')]}\">Followers of the document and</span>"
+"                            <span name=\"document_followers_text\" attrs=\"{'invisible':['|', ('model', '=', False), ('composition_mode', '=', 'mass_mail')]}\">Followers of the document and</span>"
 msgstr ""
-"<span attrs=\"{'invisible': [('composition_mode', '!=', 'mass_mail')]}\">\n"
-"<strong>電子メールの一括メール配信</strong> on\n"
-"<span attrs=\"{'invisible': [('use_active_domain', '=', True)]}\">選択されたレコード</span>\n"
-"<span attrs=\"{'invisible': [('use_active_domain', '=', False)]}\">現在の検索フィルター</span>.\n"
-"</span>\n"
-"<span attrs=\"{'invisible':['|', ('model', '=', False), ('composition_mode', '=', 'mass_mail')]}\">ドキュメントフォロワーおよび...</span>"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
@@ -355,6 +272,18 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid ""
+"<span class=\"fa fa-info-circle\"/> Caution: It won't be possible to send "
+"this mail again to the recipients you did not select."
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Activities</span>"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_template_form
 msgid ""
 "<span class=\"o_stat_text\">Add</span>\n"
@@ -389,6 +318,13 @@ msgid "<strong> Feedback</strong>"
 msgstr ""
 
 #. module: mail
+#: model_terms: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_terms: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"
@@ -401,16 +337,21 @@ 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_test_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."
 msgstr "このエイリアスの新しいレコードを作成する時にデフォルト値を与えるためのPython辞書です。"
 
 #. module: mail
+#: code:addons/mail/models/ir_actions.py:69
+#, python-format
+msgid "A next activity can only be planned on models that use the chatter"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.actions.act_window,help:mail.mail_shortcode_action
 msgid ""
 "A shortcode is a keyboard shortcut. For instance, you type #gm and it will "
@@ -418,116 +359,81 @@ msgid ""
 msgstr "ショートコードはキーボードショートカットです。 たとえば、#gmと入力すると \"Good Morning\"に変換されます。"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:185
+#: code:addons/mail/static/src/xml/thread.xml:412
+#, python-format
+msgid "Accept"
+msgstr "受理"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:185
+#, python-format
+msgid "Accept selected messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:412
+#, python-format
+msgid "Accept |"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,moderation_status:0
+#: selection:mail.message,moderation_status:0
+msgid "Accepted"
+msgstr "受理済み"
+
+#. module: mail
 #: model:ir.model,name:mail.model_res_groups
 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_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_mail_blacklist__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
 msgid "Action Needed"
 msgstr "要アクション"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__state
+msgid "Action To Do"
+msgstr "ToDo"
+
+#. module: mail
+#: model:ir.model,name:mail.model_ir_actions_act_window_view
+msgid "Action Window View"
+msgstr ""
+
+#. module: mail
+#: 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.model.fields,field_description:mail.field_mail_blacklist__active
 #: model_terms: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
 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_mail_activity_mixin_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_activity_ids
-#: model:ir.model.fields,field_description:mail.field_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
+#: code:addons/mail/static/src/xml/systray.xml:108
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_search
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
-#: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
 #: model:mail.message.subtype,name:mail.mt_activities
 #, python-format
 msgid "Activities"
@@ -535,12 +441,18 @@ msgstr "活動"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:60
+#: code:addons/mail/static/src/js/views/activity/activity_view.js:15
+#: code:addons/mail/static/src/xml/chatter.xml:93
+#: code:addons/mail/static/src/xml/systray.xml:74
+#: selection:ir.actions.act_window.view,view_mode:0
 #: 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_ir_actions_server__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_type_id
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_calendar
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model_terms:ir.ui.view,arch_db:mail.view_server_action_form_template
+#: selection:ir.ui.view,type:0
 #, python-format
 msgid "Activity"
 msgstr "活動"
@@ -551,10 +463,16 @@ msgid "Activity Mixin"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_state
+msgid "Activity State"
+msgstr "活動状態"
+
+#. module: mail
 #: model:ir.model,name:mail.model_mail_activity_type
 #: model_terms: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
@@ -564,64 +482,100 @@ msgid "Activity Types"
 msgstr "活動タイプ"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_user_type
+msgid "Activity User Type"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:37
 #, python-format
 msgid "Activity type"
-msgstr ""
+msgstr "活動タイプ"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:87
+#: code:addons/mail/static/src/xml/discuss.xml:111
 #, python-format
 msgid "Add"
 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
+#: code:addons/mail/static/src/xml/followers.xml:63
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__channel_ids
 #, python-format
 msgid "Add Channels"
 msgstr "チャネルを追加"
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_form
+msgid "Add Email Blacklist"
+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
+#: code:addons/mail/static/src/xml/followers.xml:62
+#: selection:ir.actions.server,state:0
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
 #: model_terms:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
 msgid "Add Followers"
 msgstr "フォロワーを追加"
 
 #. module: mail
-#: code:addons/mail/models/ir_actions.py:36
+#: code:addons/mail/models/ir_actions.py:63
 #, python-format
 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_mail_compose_message__add_sign
+#: model:ir.model.fields,field_description:mail.field_mail_mail__add_sign
+#: model:ir.model.fields,field_description:mail.field_mail_message__add_sign
+msgid "Add Sign"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,field_description:mail.field_mail_template__user_signature
 msgid "Add Signature"
 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:52
+#: code:addons/mail/static/src/xml/discuss.xml:242
 #, python-format
 msgid "Add a channel"
 msgstr "チャネルを追加"
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:383
+#, 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:71
 #, python-format
 msgid "Add a private channel"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.actions.act_window,help:mail.mail_blacklist_action
+msgid "Add an email address in the blacklist"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/composer.xml:15
+#, python-format
+msgid "Add attachment"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 msgid "Add channels to notify..."
 msgstr "通知するチャネルを追加..."
@@ -633,7 +587,14 @@ msgid "Add contacts to notify..."
 msgstr "連絡先を追加..."
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_partner_ids
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:418
+#, python-format
+msgid "Add this email address to white list of people"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
 msgid "Additional Contacts"
 msgstr "追加連絡先"
 
@@ -648,50 +609,62 @@ 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_mail_test_alias_id
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__delay_count
+msgid "After"
+msgstr "変更後"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/followers.xml:26
+#, python-format
+msgid "Alarm menu"
+msgstr ""
+
+#. module: mail
+#: selection:mail.activity.type,decoration_type:0
+msgid "Alert"
+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_terms:ir.ui.view,arch_db:mail.view_mail_alias_form
 #: model_terms: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_mail_test_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_test_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_test_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_test_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 "エイリアス対象モデル"
 
@@ -703,74 +676,144 @@ msgstr "エイリアス"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:17
-#: code:addons/mail/static/src/xml/systray.xml:28
+#: code:addons/mail/static/src/xml/systray.xml:20
+#: code:addons/mail/static/src/xml/systray.xml:31
 #, python-format
 msgid "All"
 msgstr "全て"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:46
+#, python-format
+msgid "All pages:&nbsp;"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Allowed Emails"
+msgstr ""
+
+#. module: mail
 #: selection:ir.model.fields,track_visibility:0
 msgid "Always"
-msgstr "常に変換"
+msgstr "常に保存"
+
+#. module: mail
+#: selection:mail.moderation,status:0
+msgid "Always Allow"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:418
+#, python-format
+msgid "Always Allow |"
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:198
+#: code:addons/mail/static/src/js/models/mail_failure.js:80
+#, python-format
+msgid "An error occured when sending an email"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/models/mail_channel.py:925
+#: code:addons/mail/static/src/js/models/messages/message.js:148
 #, 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
 msgid ""
 "Answers do not go in the original document discussion thread. This has an "
 "impact on the generated message-id."
 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 "適用"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:333
+#: code:addons/mail/static/src/js/followers.js:357
 #, python-format
 msgid "Apply"
-msgstr "申し込む"
+msgstr "適用"
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_search
+msgid "Archived"
+msgstr "アーカイブ済"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_resend_message.py:122
+#, python-format
+msgid ""
+"Are you sure you want to discard %s mail delivery failures. You won't be "
+"able to re-send these mails later!"
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:45
-#: model:ir.model.fields,field_description:mail.field_mail_activity_user_id
+#: code:addons/mail/static/src/xml/activity.xml:52
+#: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
 #, python-format
 msgid "Assigned to"
 msgstr "担当者"
 
 #. module: mail
+#: code:addons/mail/models/mail_activity.py:258
+#: code:addons/mail/models/mail_activity.py:265
+#, python-format
+msgid ""
+"Assigned user %s has no access to the document and is not able to handle "
+"this activity."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 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,name:mail.model_ir_attachment
+msgid "Attachment"
+msgstr "添付"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_attachment_count
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_attachment_count
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_attachment_count
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:11
+#: 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_terms:ir.ui.view,arch_db:mail.view_mail_form
+#, python-format
 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."
@@ -787,13 +830,12 @@ 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_terms:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Author"
-msgstr "作成者"
+msgstr "著作者"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_template_form
@@ -801,37 +843,46 @@ 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
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that"
 " did not match any partner."
 msgstr "メッセージの作成者。設定されない場合、email_fromはどの取引先とも一致しないメールアドレスを保持します。"
 
 #. 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
 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_activity__force_next
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__force_next
+msgid "Auto Schedule Next Activity"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Auto Subscribe Groups"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_ids
 msgid "Auto Subscription"
 msgstr "自動サブスクリプション"
 
@@ -841,46 +892,116 @@ msgid "Auto subscription"
 msgstr "自動サブスクリプション"
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
-msgid "Available for mass mailing"
-msgstr "一括メール配信可"
+#: model:ir.model.fields,field_description:mail.field_mail_activity__automated
+msgid "Automated activity"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_ir_autovacuum
+msgid "Automatic Vacuum"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_notify
+msgid "Automatic notification"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/followers.xml:44
+#, python-format
+msgid "Avatar"
+msgstr "アバター"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:89
+#: code:addons/mail/static/src/xml/thread.xml:420
+#, python-format
+msgid "Ban"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Ban List"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:420
+#, python-format
+msgid "Ban this email address"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Banned Emails"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/followers.xml:90
 #, python-format
 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_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
+msgid "Best regards,"
+msgstr "宜しくお願い致します。"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.mail_blacklist_action
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist_mixin__is_blacklisted
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_blacklisted
+#: model:ir.model.fields,field_description:mail.field_res_partner__is_blacklisted
+msgid "Blacklist"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_tree
+msgid "Blacklist Date"
+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_terms:ir.ui.view,arch_db:mail.view_mail_form
 #: model_terms: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
 msgid "Bounce"
 msgstr "返送"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:398
 #: selection:mail.notification,email_status:0
+#, python-format
 msgid "Bounced"
 msgstr "返送日"
 
 #. module: mail
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Calendar"
+msgstr "カレンダ"
+
+#. module: mail
 #: model:mail.activity.type,name:mail.mail_activity_data_call
 msgid "Call"
 msgstr "通話"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:341
-#: code:addons/mail/static/src/xml/activity.xml:65
+#: code:addons/mail/static/src/js/followers.js:365
+#: code:addons/mail/static/src/xml/activity.xml:86
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
 #: model_terms:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
@@ -893,14 +1014,22 @@ msgid "Cancel Email"
 msgstr "Eメール取消"
 
 #. module: mail
-#: selection:mail.mail,state:0
-msgid "Cancelled"
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid "Cancel notification in failure"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:401
+#: selection:mail.notification,email_status:0
+#, python-format
+msgid "Canceled"
 msgstr "取消済"
 
 #. module: mail
-#: selection:mail.shortcode,shortcode_type:0
-msgid "Canned Response"
-msgstr "Canned Response"
+#: selection:mail.mail,state:0
+msgid "Cancelled"
+msgstr "取消済"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_shortcode
@@ -908,32 +1037,37 @@ 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 "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 "CC宛先"
 
 #. 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,field_description:mail.field_res_company__catchall
+msgid "Catchall Email"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,help:mail.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
 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 "CC"
 
@@ -943,40 +1077,73 @@ msgid "Change"
 msgstr "変更"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_decoration
+#: model:ir.model.fields,help:mail.field_mail_activity_type__decoration_type
+msgid "Change the background color of the related activities of this type."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:443
+#, python-format
+msgid "Changed"
+msgstr ""
+
+#. module: mail
+#: 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
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:108
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__channel_id
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_kanban
 #: selection:mail.channel,channel_type:0
+#, python-format
 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.ui.menu,name:mail.mail_moderation_menu
+msgid "Channel Moderation"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_type
 msgid "Channel Type"
 msgstr "チャネルタイプ"
 
 #. module: mail
+#: model:ir.model,name:mail.model_mail_moderation
+msgid "Channel black/white list"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:144
+#, python-format
+msgid "Channel settings"
+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/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
+#: code:addons/mail/static/src/xml/discuss.xml:47
+#: code:addons/mail/static/src/xml/discuss.xml:224
+#: code:addons/mail/static/src/xml/systray.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:39
+#: 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.ui.menu,name:mail.mail_channel_menu_settings
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
 #, python-format
@@ -991,10 +1158,9 @@ msgstr "チャネル/取引先"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.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
+#: code:addons/mail/static/src/xml/discuss.xml:220
+#: code:addons/mail/static/src/xml/systray.xml:21
+#: code:addons/mail/static/src/xml/systray.xml:35
 #, python-format
 msgid "Chat"
 msgstr "チャット"
@@ -1010,10 +1176,9 @@ 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
 msgid "Child Messages"
 msgstr "子メッセージ"
 
@@ -1023,23 +1188,18 @@ msgid "Choose an example"
 msgstr "例を選択"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:342
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:50
 #, python-format
-msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
-msgstr ""
-"クリックして新しくドキュメント %(document)s を作成するか、\n"
-"%(email_link)s　宛にメールを送信する"
+msgid "Close"
+msgstr "閉じる"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:358
+#. openerp-web
+#: code:addons/mail/static/src/xml/abstract_thread_window.xml:67
 #, python-format
-msgid "Click here to add new %s"
-msgstr "クリックして新規に %s を追加してください。"
-
-#. module: mail
-#: model_terms:ir.actions.act_window,help:mail.mail_shortcode_action
-msgid "Click to define a new chat shortcode."
-msgstr "新しいチャットのショートコードを定義する場合にクリックします。"
+msgid "Close chat window"
+msgstr ""
 
 #. module: mail
 #: selection:mail.channel.partner,fold_state:0
@@ -1057,8 +1217,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(プレースホルダはここで使用します)"
@@ -1069,8 +1229,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 "コンマで区切られた受取人アドレス"
 
@@ -1078,42 +1238,58 @@ msgstr "コンマで区切られた受取人アドレス"
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_search
 #: selection:mail.compose.message,message_type:0
 #: selection:mail.message,message_type:0
-#: selection:survey.mail.compose.message,message_type:0
 msgid "Comment"
 msgstr "コメント"
 
 #. module: mail
+#: model:ir.model,name:mail.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/activity.js:378
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#, python-format
 msgid "Compose Email"
 msgstr "Eメール作成"
 
 #. 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
 msgid "Composition mode"
 msgstr "合成モード"
 
 #. module: mail
+#: model:ir.model,name:mail.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
 msgid "Configure your activity types"
 msgstr "活動タイプを設定"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:109
+#: code:addons/mail/static/src/xml/thread.xml:130
 #, 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:944
 #, python-format
 msgid "Congratulations, your inbox is empty!"
 msgstr ""
 
 #. module: mail
+#: selection:mail.notification,failure_type:0
+msgid "Connection failed (outgoing mail server problem)"
+msgstr ""
+
+#. module: mail
 #: model:ir.model,name:mail.model_res_partner
 msgid "Contact"
 msgstr "連絡先"
@@ -1125,47 +1301,62 @@ 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
 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 "会話は最小限に抑えられます"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
+#: code:addons/mail/static/src/xml/systray.xml:9
 #, python-format
 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
 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:565
 #, python-format
 msgid "Create %s"
 msgstr "%s を作成"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
-msgid "Create Date"
-msgstr "作成日"
+#: selection:ir.actions.server,state:0
+msgid "Create Next Activity"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:400
+#, python-format
+msgid "Create a new %(document)s"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:392
+#, python-format
+msgid "Create a new %(document)s by sending an email to %(email_link)s"
+msgstr ""
+
+#. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Create a new Record"
+msgstr "レコードを新規作成"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
@@ -1173,136 +1364,104 @@ 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_test_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_blacklist__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_moderation__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_uid
+#: 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_test_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_blacklist__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__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_moderation__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_date
 #, python-format
 msgid "Created on"
 msgstr "作成日"
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_form
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_search
-msgid "Creation Month"
-msgstr "作成月"
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__create_user_id
+msgid "Creator"
+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
 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,help:mail.field_mail_channel__is_moderator
+msgid "Current user is a moderator of the channel"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__date
+#: model:ir.model.fields,field_description:mail.field_mail_message__date
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
 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_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_simple_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
-msgid "Date of the last message posted on the record."
-msgstr "記録上の最後のメッセージが投稿された日付"
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:93
+#, python-format
+msgid "Dates"
+msgstr "日付"
 
 #. module: mail
+#: selection:ir.actions.server,activity_date_deadline_range_type:0
+msgid "Days"
+msgstr "日"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:46
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
+#, python-format
 msgid "Deadline"
 msgstr "期日"
 
@@ -1312,33 +1471,43 @@ 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_activity__activity_decoration
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__decoration_type
+msgid "Decoration Type"
+msgstr ""
+
+#. module: mail
+#: 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_mail_activity_type__default_next_type_id
+msgid "Default Next Activity"
+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
 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_test_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"
@@ -1349,62 +1518,80 @@ msgstr ""
 "- 電子メール(email_fromまたは電子メールフィールドを使用)"
 
 #. 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_terms: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_activity_type__delay_from
+msgid "Delay Type"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__delay_unit
+msgid "Delay units"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/composer.xml:87
+#: code:addons/mail/static/src/xml/thread.xml:532
+#, python-format
+msgid "Delete"
+msgstr "削除"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_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
 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
 msgid "Delete sent emails (mass mailing only)"
 msgstr "送信されたメールを削除する(一括メールのみ)"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:320
-#, python-format
-msgid "Delete this attachment"
-msgstr "この添付の削除"
-
-#. module: mail
 #: selection:mail.mail,state:0
 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_test_description
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_terms: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."
 msgstr "このサブタイプのために投稿したメッセージに追加される説明です。"
 
 #. module: mail
+#: selection:ir.ui.view,type:0
+msgid "Diagram"
+msgstr "ダイアグラム"
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:46
+#: code:addons/mail/static/src/xml/discuss.xml:57
 #, python-format
 msgid "Direct Messages"
 msgstr "ダイレクトメッセージ"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:81
+#: code:addons/mail/static/src/js/discuss.js:348
+#: code:addons/mail/static/src/xml/activity.xml:103
+#: code:addons/mail/static/src/xml/discuss.xml:187
 #: model_terms:ir.ui.view,arch_db:mail.email_template_preview_form
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
 #, python-format
@@ -1412,7 +1599,32 @@ msgid "Discard"
 msgstr "破棄"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.mail_channel_menu_root_chat
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid "Discard delivery failures"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.mail_resend_cancel_action
+msgid "Discard mail delivery failures"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:187
+#, python-format
+msgid "Discard selected messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:416
+#, python-format
+msgid "Discard |"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_discuss
+#: model:ir.ui.menu,name:mail.menu_root_discuss
 #: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
 msgid "Discuss"
 msgstr "ディスカス"
@@ -1428,28 +1640,37 @@ 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_test_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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,name:mail.model_mail_resend_cancel
+msgid "Dismiss notification for resend by model"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_activity__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__display_name
+#: 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_blacklist__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist_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_moderation__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_notification__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_thread__display_name
+#: 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 "表示名"
 
@@ -1461,107 +1682,146 @@ 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
 msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
 msgstr "電子メールのコピーを文書の通信履歴に残さないでください(一括メールのみ)"
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.view_document_file_kanban
+msgid "Document"
+msgstr "ドキュメント"
+
+#. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 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 ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:79
+#: code:addons/mail/static/src/xml/activity.xml:101
 #, python-format
 msgid "Done"
 msgstr "完了"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:77
+#: code:addons/mail/static/src/xml/activity.xml:107
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
 #, python-format
-msgid "Done & Schedule Next"
+msgid "Done & Launch Next"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:296
+#: code:addons/mail/static/src/xml/activity.xml:99
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
 #, python-format
-msgid "Download this PDF"
+msgid "Done & Schedule Next"
 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:43
+#: code:addons/mail/static/src/xml/thread.xml:77
 #, python-format
-msgid "Download this attachment"
+msgid "Download"
+msgstr "ダウンロード"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/followers.xml:11
+#, python-format
+msgid "Dropdown menu - Followers"
 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
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_date_deadline_range
+msgid "Due Date In"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:38
+#: code:addons/mail/static/src/js/activity.js:95
 #, python-format
 msgid "Due in %d days"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_date_deadline_range_type
+msgid "Due type"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_template_form
 msgid "Dynamic Placeholder Generator"
 msgstr "動的プレースホルダ生成"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:62
+#: code:addons/mail/static/src/xml/activity.xml:83
 #, python-format
 msgid "Edit"
 msgstr "編集"
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid "Edit Partners"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:330
+#: code:addons/mail/static/src/js/followers.js:354
 #, python-format
 msgid "Edit Subscription of "
 msgstr "サブスクリプションの編集"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:49
+#: code:addons/mail/static/src/xml/followers.xml:50
 #, python-format
 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.model.fields,field_description:mail.field_mail_moderation__email
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__email
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_search
 #: model:mail.activity.type,name:mail.mail_activity_data_email
 #: selection:mail.compose.message,message_type:0
 #: selection:mail.message,message_type:0
-#: selection:survey.mail.compose.message,message_type:0
 msgid "Email"
 msgstr "Eメール"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__email
+msgid "Email Address"
+msgstr "Eメールアドレス"
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Email Alias"
 msgstr "Eメールエイリアス"
@@ -1572,16 +1832,21 @@ msgid "Email Aliases"
 msgstr "Eメールエイリアス"
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.email_template_form
-msgid "Email Configuration"
-msgstr "Eメール設定"
+#: model:ir.model,name:mail.model_mail_alias_mixin
+msgid "Email Aliases Mixin"
+msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_email_from
-msgid "Email From"
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_tree
+msgid "Email Blacklist"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
+msgid "Email Configuration"
+msgstr "Eメール設定"
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_template_preview_form
 msgid "Email Preview"
 msgstr "Eメールプレビュー"
@@ -1592,12 +1857,12 @@ msgid "Email Search"
 msgstr "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 "メールステータス"
 
 #. 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メールテンプレート"
 
@@ -1617,17 +1882,21 @@ msgid "Email Thread"
 msgstr "Eメールスレッド"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_alias_id
+#: sql_constraint:mail.blacklist:0
+msgid "Email address already exists!"
+msgstr ""
+
+#. module: mail
+#: 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
 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."
@@ -1636,11 +1905,23 @@ msgstr ""
 "このフィールドは、一致するパートナーが見つからない場合に設定され、チャタリング内のauthor_idフィールドを置き換えます。"
 
 #. module: mail
+#: selection:mail.notification,failure_type:0
+msgid "Email address rejected by destination"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid "Email address to redirect replies..."
 msgstr "返信をリダイレクトする電子メールアドレス..."
 
 #. module: mail
+#: model_terms:ir.actions.act_window,help:mail.mail_blacklist_action
+msgid ""
+"Email addresses that are blacklisted means that the recipient won't receive "
+"any mass mailing anymore."
+msgstr ""
+
+#. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
 msgstr "Eメール構成ウィザード"
@@ -1652,6 +1933,11 @@ msgid "Email message"
 msgstr "Eメールメッセージ"
 
 #. module: mail
+#: model:ir.model,name:mail.model_mail_resend_message
+msgid "Email resend wizard"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_mail
 #: model:ir.ui.menu,name:mail.menu_mail_mail
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_tree
@@ -1659,13 +1945,33 @@ msgid "Emails"
 msgstr "Eメール"
 
 #. module: mail
-#: code:addons/mail/models/update.py:97
+#. openerp-web
+#: code:addons/mail/static/src/xml/composer.xml:14
+#, python-format
+msgid "Emojis"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid "Envelope Example"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:399
+#: selection:mail.activity.type,decoration_type:0
+#, python-format
+msgid "Error"
+msgstr "エラー"
+
+#. module: mail
+#: code:addons/mail/models/update.py:98
 #, python-format
 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:317
 #, python-format
 msgid ""
 "Error without exception. Probably due do sending an email without computed "
@@ -1694,17 +2000,35 @@ msgid "Everyone"
 msgstr "制限なし"
 
 #. module: mail
+#: model:mail.activity.type,name:mail.mail_activity_data_warning
 #: selection:mail.notification,email_status:0
 msgid "Exception"
 msgstr "例外"
 
 #. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Execute Python Code"
+msgstr "Pythonコードを実行"
+
+#. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Execute several actions"
+msgstr "各種アクションの実行"
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Extended Filters..."
 msgstr "拡張フィルタ…"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_fail_counter
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:45
+#, python-format
+msgid "Extract pages:&nbsp;"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__fail_counter
 msgid "Fail Mail"
 msgstr "失敗メール"
 
@@ -1714,64 +2038,73 @@ msgid "Failed"
 msgstr "不合格"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:374
+#: code:addons/mail/models/mail_template.py:338
 #, 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_terms: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,field_description:mail.field_mail_notification__failure_reason
+msgid "Failure reason"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
 msgid ""
 "Failure reason. This is usually the exception thrown by the email server, "
 "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_notification__failure_type
+msgid "Failure type"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred_partner_ids
 msgid "Favorited By"
-msgstr "気に入った人"
+msgstr "いいねした人"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:209
-#: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
+#: code:addons/mail/static/src/js/activity.js:316
+#: 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 "
@@ -1785,8 +2118,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."
@@ -1799,7 +2132,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"
@@ -1807,196 +2139,28 @@ 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_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_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_mail_blacklist__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_thread__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: model_terms: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_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_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_mail_blacklist__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_thread__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__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_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_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_mail_blacklist__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_thread__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
 msgid "Followers (Partners)"
 msgstr "フォロワー (取引先)"
 
@@ -2007,7 +2171,7 @@ msgstr "フォロワーフォーム"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:15
+#: code:addons/mail/static/src/xml/chatter.xml:40
 #, python-format
 msgid "Followers of"
 msgstr ""
@@ -2025,24 +2189,36 @@ 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
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Form"
+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
 msgid "From"
-msgstr "移動元"
+msgstr "差出人"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:77
+#: code:addons/mail/static/src/xml/chatter.xml:73
+#, python-format
+msgid "Full composer"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/systray.xml:98
 #, python-format
 msgid "Future"
 msgstr "将来"
@@ -2054,17 +2230,34 @@ msgid "Future Activities"
 msgstr "将来の活動"
 
 #. module: mail
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Gantt"
+msgstr "ガント"
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_message_form
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:54
+#: selection:ir.actions.server,activity_user_type:0
+msgid "Generic User From Record"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/res_users.py:88
 #, python-format
 msgid "Go to the configuration panel"
 msgstr "コンフィグレーションパネルに移動"
 
 #. module: mail
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Graph"
+msgstr "グラフ"
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_search
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_search
@@ -2082,6 +2275,17 @@ msgid "Groups"
 msgstr "グループ"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_guidelines_msg
+msgid "Guidelines"
+msgstr "ガイドライン"
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
+msgstr ""
+
+#. module: mail
 #: selection:res.users,notification_type:0
 msgid "Handle by Emails"
 msgstr "メール送信"
@@ -2092,6 +2296,11 @@ msgid "Handle in Odoo"
 msgstr "Odoo内にとどめる"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__has_cancel
+msgid "Has Cancel"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_message_search
 msgid "Has Mentions"
 msgstr "メンションあり"
@@ -2102,240 +2311,152 @@ 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_compose_message__has_error
+#: model:ir.model.fields,field_description:mail.field_mail_mail__has_error
+#: model:ir.model.fields,field_description:mail.field_mail_message__has_error
+#: model:ir.model.fields,help:mail.field_mail_compose_message__has_error
+#: model:ir.model.fields,help:mail.field_mail_mail__has_error
+#: model:ir.model.fields,help:mail.field_mail_message__has_error
+msgid "Has error"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_mail__headers
 #: model_terms: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_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Hello"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__help_message
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__message
+msgid "Help message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
 msgid "Hidden"
 msgstr "非表示"
 
 #. 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_test_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_blacklist__id
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist_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_moderation__id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__id
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__id
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__id
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__id
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__id
+#: model:ir.model.fields,field_description:mail.field_mail_template__id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__id
+#: 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_test_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:157
+#: code:addons/mail/static/src/xml/discuss.xml:277
 #, 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_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_simple_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_mail_blacklist__message_unread
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,help:mail.field_res_partner__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_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_simple_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_mail_blacklist__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,help:mail.field_res_partner__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_blacklist__message_has_error
+#: model:ir.model.fields,help:mail.field_mail_channel__message_has_error
+#: model:ir.model.fields,help:mail.field_mail_thread__message_has_error
+#: model:ir.model.fields,help:mail.field_res_partner__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
 msgid ""
 "If checked, the partners will receive an email warning they have been added "
 "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
-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 "
-"users to filter the partners when performing mass mailing."
-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."
@@ -2344,33 +2465,79 @@ msgstr ""
 "Jinja2プレースホルダを使用することができます。"
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_config_settings_alias_domain
+#: model:ir.model.fields,help:mail.field_mail_blacklist_mixin__is_blacklisted
+#: model:ir.model.fields,help:mail.field_mail_channel_partner__is_blacklisted
+#: model:ir.model.fields,help:mail.field_res_partner__is_blacklisted
+msgid ""
+"If the email address is on the blacklist, the contact won't receive mass "
+"mailing anymore, from any list"
+msgstr ""
+
+#. module: mail
+#: 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
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid ""
+"If you want to re-send them, click Cancel now, then click on the "
+"notification and review them one by one by clicking on the red envelope next"
+" to each message."
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid "Ignore all failures"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:39
+#, python-format
+msgid "Image"
+msgstr "画像"
+
+#. module: mail
+#: 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/mail_manager.js:1232
+#: code:addons/mail/static/src/xml/discuss.xml:27
+#: code:addons/mail/static/src/xml/discuss.xml:205
+#: code:addons/mail/static/src/xml/discuss.xml:216
 #, 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_activity__automated
+msgid ""
+"Indicates this activity has been created automatically and not by any user."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:33
+#, python-format
+msgid "Info"
+msgstr "情報"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__initial_res_model_id
+msgid "Initial model"
+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
 msgid "Initial thread message."
 msgstr "初期スレッドメッセージ"
 
@@ -2381,12 +2548,17 @@ 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
+#: selection:mail.notification,failure_type:0
+msgid "Invalid email address"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_alias.py:88
 #, python-format
 msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
@@ -2394,7 +2566,15 @@ msgid ""
 msgstr "式が無効です。リテラルPython辞書定義でなければなりません。 例,\"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1792
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
+#, python-format
+msgid "Invalid primary email field on model %s"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:1968
+#: code:addons/mail/models/mail_thread.py:2199
 #, python-format
 msgid ""
 "Invalid record set: should be called as model (without records) or on "
@@ -2402,14 +2582,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 "ルート%sのトークンが無効です"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/mail_notification_manager.js:197
 #, python-format
 msgid "Invitation"
 msgstr "招待"
@@ -2418,34 +2598,34 @@ msgstr "招待"
 #: code:addons/mail/wizard/invite.py:53
 #, python-format
 msgid "Invitation to follow %s: %s"
-msgstr "%sに従う招待： %s"
+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:45
+#: code:addons/mail/static/src/xml/discuss.xml:178
 #, python-format
 msgid "Invite"
 msgstr "招待"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:170
+#: code:addons/mail/static/src/js/followers.js:171
 #, python-format
 msgid "Invite Follower"
 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:30
+#: code:addons/mail/static/src/xml/discuss.xml:178
 #, 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:1188
 #, python-format
 msgid "Invite people to #%s"
 msgstr " #%s にユーザを招待する"
@@ -2461,91 +2641,50 @@ 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_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_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_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Is Allowed"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Is Banned"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__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_thread__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_partner__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 "読む"
+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_res_users__is_moderator
+msgid "Is moderator"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
 msgid "Is pinned on the interface"
 msgstr "画面に固定されている"
 
@@ -2560,152 +2699,104 @@ 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
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Kanban"
+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
 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_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_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
-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_test___last_update
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple___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_blacklist____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist_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_moderation____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_notification____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_template____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_thread____last_update
+#: 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_test_simple_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_test_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid
+#: 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_blacklist__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_moderation__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_uid
+#: 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_test_simple_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_test_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date
+#: 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_blacklist__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_moderation__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_date
 msgid "Last Updated on"
 msgstr "最終更新日"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:73
+#: code:addons/mail/static/src/xml/systray.xml:94
 #, python-format
 msgid "Late"
 msgstr "遅延"
@@ -2717,43 +2808,50 @@ msgid "Late Activities"
 msgstr "遅れた活動"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__layout
+#: model:ir.model.fields,field_description:mail.field_mail_mail__layout
+#: model:ir.model.fields,field_description:mail.field_mail_message__layout
+msgid "Layout"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_kanban
 msgid "Leave"
 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:935
+#: code:addons/mail/static/src/xml/discuss.xml:147
 #, 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:946
 #, 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 "チャネル"
 
@@ -2769,7 +2867,29 @@ msgstr "ライブチャットの会話"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:31
+#: code:addons/mail/static/src/xml/thread.xml:55
+#, python-format
+msgid "Loading"
+msgstr "ロード中"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:544
+#, python-format
+msgid "Loading older messages..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:15
+#, python-format
+msgid "Loading..."
+msgstr "読込中..."
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/composers/chatter_composer.js:34
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:41
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Log"
@@ -2777,13 +2897,14 @@ msgstr "ログ"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:56
+#: code:addons/mail/static/src/xml/chatter.xml:89
 #, python-format
 msgid "Log a note. Followers will not be notified."
 msgstr "ノートを記録します。 フォロワーは通知されません。"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model_terms:ir.ui.view,arch_db:mail.view_server_action_form_template
 msgid "Log a note..."
 msgstr "メモを記録..."
 
@@ -2793,46 +2914,70 @@ 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
 msgid "Log an Internal Note"
 msgstr "内部メモを記録"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:56
+#: code:addons/mail/static/src/xml/chatter.xml:89
 #, python-format
 msgid "Log note"
 msgstr "メモを記録"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:59
+#: code:addons/mail/static/src/xml/chatter.xml:92
 #, python-format
 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
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:68
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:51
+#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_id
+#, python-format
+msgid "Mail"
+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
 msgid "Mail Activity Type"
+msgstr "メール活動タイプ"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_blacklist
+msgid "Mail Blacklist"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_mail_blacklist_mixin
+msgid "Mail Blacklist mixin"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:198
+#, python-format
+msgid "Mail Body"
+msgstr "Eメール本文"
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Mail Channel Form"
 msgstr "メールチャンネルフォーム"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:369
+#: code:addons/mail/models/mail_mail.py:385
 #, 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_terms:ir.ui.view,arch_db:mail.model_search_view
 msgid "Mail Thread"
 msgstr ""
@@ -2843,7 +2988,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を知らせるメールが作成されました"
 
@@ -2855,33 +3000,57 @@ msgid "Mail: Email Queue Manager"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:832
+#: model:ir.actions.server,name:mail.ir_cron_mail_notify_channel_moderators_ir_actions_server
+#: model:ir.cron,cron_name:mail.ir_cron_mail_notify_channel_moderators
+#: model:ir.cron,name:mail.ir_cron_mail_notify_channel_moderators
+msgid "Mail: Notify channel moderators"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:939
 #, python-format
 msgid "Mailbox unavailable - %s"
 msgstr ""
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.res_partner_view_form_inherit_mail
-msgid "Mailing Opt-Out"
-msgstr "メールオプトアウト"
+#: model:ir.model.fields,field_description:mail.field_mail_activity__mail_template_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__mail_template_ids
+msgid "Mails templates"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_main_attachment_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_main_attachment_id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_main_attachment_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/tools/debug_manager.js:22
+#: code:addons/mail/static/src/xml/thread.xml:9
+#, python-format
+msgid "Manage Messages"
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:59
+#: code:addons/mail/static/src/xml/activity.xml:80
 #, python-format
 msgid "Mark Done"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:179
 #, 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:179
 #, python-format
 msgid "Mark all read"
 msgstr "全て既読にする"
@@ -2893,33 +3062,39 @@ msgstr "完了としてマーク"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:206
+#: code:addons/mail/static/src/xml/discuss.xml:298
+#: code:addons/mail/static/src/xml/thread.xml:346
 #, 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:299
+#: code:addons/mail/static/src/xml/thread.xml:340
 #, python-format
 msgid "Mark as Todo"
 msgstr "処理準備"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:49
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:71
 #, python-format
 msgid "Mark as done"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
+#: model:ir.ui.menu,name:mail.mail_blacklist_menu
+msgid "Mass Mail Blacklist"
+msgstr ""
+
+#. module: mail
+#: 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 "
@@ -2940,23 +3115,43 @@ 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
+#: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
+msgid "Merge Partner Wizard"
+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_resend_message__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
 #: model_terms: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_blacklist__message_has_error
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_has_error
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_has_error
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
 msgid "Message ID"
 msgstr "メッセージID"
 
@@ -2966,37 +3161,42 @@ 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
 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
+#: code:addons/mail/models/mail_message.py:1277
+#, python-format
+msgid "Message are pending moderation"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_mail__email_to
 msgid "Message recipients (emails)"
 msgstr "メセージ宛先 (Eメール)"
 
 #. 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:165
 #, 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"
@@ -3012,100 +3212,41 @@ 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
 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
 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
 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_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_mail_blacklist__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
 #: model:ir.ui.menu,name:mail.menu_mail_message
 #: model_terms:ir.ui.view,arch_db:mail.view_message_tree
 msgid "Messages"
@@ -3124,27 +3265,40 @@ msgid "Messages can be <b>starred</b> to remind you to check back later."
 msgstr "メッセージは後で確認するように<b>スター付き</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 "内部サブタイプのメッセージは、従業員、 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
+#. openerp-web
+#: code:addons/mail/static/src/js/models/threads/mailbox.js:202
+#, python-format
+msgid "Missing domain for mailbox with ID '%s'"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__res_model_id
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__res_model
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__model
 #: model_terms:ir.ui.view,arch_db:mail.view_email_template_search
 #: model_terms: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,field_description:mail.field_mail_activity_type__res_model_change
+msgid "Model has change"
+msgstr ""
+
+#. module: mail
+#: 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 "サブタイプが適用されるモデルです。そうでない場合、このサブタイプはすべてのモデルに適用されます。"
@@ -3155,13 +3309,95 @@ msgid "Models"
 msgstr "モデル"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/services/mail_manager.js:1244
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#, python-format
+msgid "Moderate Messages"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation
+msgid "Moderate this channel"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__moderator_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__moderator_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__moderator_id
+msgid "Moderated By"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_ids
+msgid "Moderated Emails"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_users__moderation_channel_ids
+msgid "Moderated channels"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_count
+msgid "Moderated emails count"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.mail_moderation_action
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Moderation"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_tree
+msgid "Moderation Lists"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:39
+#, python-format
+msgid "Moderation Queue"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__moderation_status
+#: model:ir.model.fields,field_description:mail.field_mail_mail__moderation_status
+#: model:ir.model.fields,field_description:mail.field_mail_message__moderation_status
+msgid "Moderation Status"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_users__moderation_counter
+msgid "Moderation count"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_moderator
+msgid "Moderator"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderator_ids
+msgid "Moderators"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+msgid ""
+"Modifying the model can have an impact on existing activities using this "
+"activity type, be careful."
+msgstr ""
+
+#. module: mail
 #: model:ir.model,name:mail.model_base_module_uninstall
-msgid "Module Uninstallation"
+msgid "Module Uninstall"
 msgstr ""
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
-msgid "Month"
+#: selection:ir.actions.server,activity_date_deadline_range_type:0
+msgid "Months"
 msgstr "月"
 
 #. module: mail
@@ -3171,27 +3407,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_mail_test_name
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_resend_partner__name
+#: model:ir.model.fields,field_description:mail.field_mail_template__name
 #: model_terms: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
 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."
@@ -3200,240 +3434,225 @@ 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,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_terms: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_compose_message__need_moderation
+#: model:ir.model.fields,field_description:mail.field_mail_mail__need_moderation
+#: model:ir.model.fields,field_description:mail.field_mail_message__need_moderation
+msgid "Need moderation"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
 msgid "Needaction Recipient"
 msgstr "要アクション受信者"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:138
+#: code:addons/mail/static/src/xml/discuss.xml:182
 #, 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:181
 #, 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 "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 "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 "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 "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 "Monetary新値"
 
 #. 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 "Text新値"
 
 #. 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/xml/systray.xml:12
-#: code:addons/mail/static/src/xml/systray.xml:21
+#: code:addons/mail/static/src/js/services/mail_manager.js:935
+#: code:addons/mail/static/src/js/thread_windows/thread_window.js:112
+#: code:addons/mail/static/src/xml/systray.xml:15
+#: code:addons/mail/static/src/xml/systray.xml:24
 #, python-format
 msgid "New message"
 msgstr "新規メッセージ"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:233
+#: code:addons/mail/static/src/xml/thread.xml:429
 #, 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:131
 #, 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:104
 #, python-format
 msgid "New people"
 msgstr "新しい人"
 
 #. module: mail
+#: model:ir.model.fields,help:mail.field_mail_channel__moderation_guidelines
+msgid ""
+"Newcomers on this moderated channel will automatically receive the "
+"guidelines."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:95
+#, python-format
+msgid "Next"
+msgstr "次へ"
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_tree
 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_mail_activity_mixin_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_note_note_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_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_mail_activity_mixin__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_partner__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_mail_activity_mixin_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_summary
-#: model:ir.model.fields,field_description:mail.field_note_note_activity_summary
-#: model:ir.model.fields,field_description:mail.field_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_mail_activity_mixin__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_partner__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_mail_activity_mixin_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_note_note_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_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_mail_activity_mixin__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__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 ""
 
 #. module: mail
+#: code:addons/mail/models/mail_notification.py:50
+#, python-format
+msgid "No Error"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:58
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:68
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:20
 #, python-format
 msgid "No activities planned."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:47
+#: code:addons/mail/static/src/xml/systray.xml:54
 #, python-format
-msgid "No discussion yet..."
+msgid "No conversation yet..."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:185
+#: code:addons/mail/static/src/xml/activity_view.xml:21
+#, python-format
+msgid "No data to display"
+msgstr "表示するデータがありません"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/followers.js:186
 #, python-format
 msgid "No follower"
 msgstr "フォロワーなし"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:16
+#: code:addons/mail/static/src/xml/thread.xml:27
 #, python-format
 msgid "No matches found"
 msgstr "一致が見つかりません"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:17
+#: code:addons/mail/static/src/js/tools/debug_manager.js:17
+#, python-format
+msgid "No message available"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:28
 #, python-format
 msgid "No message matches your search. Try to change your search filters."
 msgstr "あなたの検索と一致するメッセージはありません。 検索フィルターを変更してみてください。"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:113
+#: code:addons/mail/static/src/xml/thread.xml:134
 #, 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
 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_ir_actions_server__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:304
 #, python-format
 msgid "Note by"
 msgstr "注記 by"
@@ -3444,292 +3663,122 @@ 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_channel__moderation_notify_msg
+msgid "Notification message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_resend_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
 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
 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_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_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_mail_blacklist__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_thread__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__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__delay_count
 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_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_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
-msgid "Number of messages which requires an action"
-msgstr "アクションを必要とするメッセージの数"
+"Number of days/week/month 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_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_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_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
-msgid "Number of unread messages"
-msgstr "未読メッセージ件数"
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_has_error_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_has_error_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_has_error_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_has_error_counter
+msgid "Number of error"
+msgstr ""
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.message_user_assigned
-msgid "Odoo"
-msgstr "Odoo"
+#: model:ir.model.fields,help:mail.field_mail_blacklist__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr "アクションを必要とするメッセージの数"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:895
-#, python-format
-msgid ""
-"Odoo has now the permission to send you native notifications on this device."
+#: model:ir.model.fields,help:mail.field_mail_blacklist__message_has_error_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_has_error_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_has_error_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_has_error_counter
+msgid "Number of messages with delivery error"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
-#, python-format
-msgid "Odoo needs your permission to"
-msgstr "許可しますか？"
+#: model:ir.model.fields,help:mail.field_mail_blacklist__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
+msgid "Number of unread messages"
+msgstr "未読メッセージ件数"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:892
-#, python-format
-msgid ""
-"Odoo will not have the permission to send native notifications on this "
-"device."
-msgstr ""
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_light
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
+#: model_terms:ir.ui.view,arch_db:mail.message_notification_email
+msgid "Odoo"
+msgstr "Odoo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:120
+#: code:addons/mail/static/src/xml/discuss.xml:158
 #, 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 "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 "DateTime旧値"
+msgstr "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 "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 "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 "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 "Text旧値"
 
@@ -3749,21 +3798,21 @@ msgstr "メッセージにスターを付けると、いつでもメッセージ
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:187
+#: code:addons/mail/static/src/js/followers.js:188
 #, python-format
 msgid "One follower"
 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:156
+#: code:addons/mail/static/src/xml/discuss.xml:276
 #, 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 ""
@@ -3785,36 +3834,29 @@ msgstr "親ドキュメントを開く"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:243
 #, python-format
-msgid "Open channel settings"
-msgstr "チャネル設定を開く"
+msgid "Open chat"
+msgstr "チャットを開く"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:187
+#: code:addons/mail/static/src/js/thread_windows/thread_window.js:190
 #, python-format
-msgid "Open chat"
-msgstr "チャットを開く"
+msgid "Open document"
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/extended_chat_window.xml:15
+#: code:addons/mail/static/src/js/thread_windows/thread_window.js:192
 #, python-format
 msgid "Open in Discuss"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_partner_opt_out
-#: model:ir.model.fields,field_description:mail.field_res_users_opt_out
-msgid "Opt-Out"
-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_test_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 "
@@ -3822,22 +3864,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 "
@@ -3848,8 +3890,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 "目標項目が空白の場合に使う値"
 
@@ -3859,13 +3901,14 @@ msgid "Other"
 msgstr "その他"
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
+#: selection:mail.mail,state:0
 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 "送信メールサーバ"
 
@@ -3875,31 +3918,16 @@ 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
 msgid "Outgoing mail server"
 msgstr "送信メールサーバ"
 
 #. module: mail
-#: selection:account.invoice,activity_state:0
-#: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
-#: selection:hr.applicant,activity_state:0 selection:mail.activity,state:0
+#: selection:mail.activity,state:0
 #: selection:mail.activity.mixin,activity_state:0
-#: selection:maintenance.equipment,activity_state:0
-#: selection:maintenance.request,activity_state:0
-#: selection:mrp.production,activity_state:0
-#: selection:mrp.repair,activity_state:0
-#: selection:mrp.unbuild,activity_state:0 selection:note.note,activity_state:0
-#: selection:product.product,activity_state:0
-#: selection:product.template,activity_state:0
-#: selection:project.task,activity_state:0
-#: selection:purchase.order,activity_state:0
 #: selection:res.partner,activity_state:0
-#: selection:sale.order,activity_state:0
-#: selection:stock.picking,activity_state:0
-#: selection:survey.survey,activity_state:0
 msgid "Overdue"
 msgstr "滞納"
 
@@ -3909,47 +3937,49 @@ 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_test_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
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:40
+#, python-format
+msgid "PDF file"
+msgstr ""
+
+#. module: mail
+#: 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
 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_test_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_test_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_test_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 "
@@ -3958,7 +3988,7 @@ msgstr ""
 "エイリアスを保持する親モデル。エイリアスの参照を保持しているモデルは、必ずしもalias_model_idによって与えられたモデルではありません(例：プロジェクト(parent_model)とタスク(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 "
@@ -3968,79 +3998,93 @@ msgstr ""
 "たとえば、プロジェクトの場合、プロジェクトサブタイプのparent_idはタスク関連のサブタイプを指します。"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_partner_mass_mail
-msgid "Partner Mass Mailing"
-msgstr "パートナー一括メーリング"
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__partner_id
+msgid "Partner"
+msgstr "取引先"
 
 #. module: mail
-#: code:addons/mail/models/res_partner.py:32
+#: code:addons/mail/models/res_partner.py:29
 #, python-format
 msgid "Partner Profile"
 msgstr "パートナープロファイル"
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
-msgid "Partners that did not ask not to be included in mass mailing campaigns"
-msgstr "一括メール送信キャンペーンに含まれないよう依頼が無かったパートナー"
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__partner_readonly
+msgid "Partner Readonly"
+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,name:mail.model_mail_resend_partner
+msgid "Partner with additionnal information for mail resend"
+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
 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
-msgid "Permanently delete this email after sending it, to save space"
-msgstr "送信後、このEメールを削除（スペース節約のため）"
+#: selection:mail.compose.message,moderation_status:0
+#: selection:mail.message,moderation_status:0
+msgid "Pending Moderation"
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:891
+#: code:addons/mail/static/src/xml/thread.xml:424
 #, python-format
-msgid "Permission denied"
+msgid "Pending moderation"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:894
+#: code:addons/mail/static/src/xml/thread.xml:139
 #, python-format
-msgid "Permission granted"
+msgid "Pending moderation messages appear here."
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_channel__moderation_notify
+msgid ""
+"People receive an automatic notification about their message being waiting "
+"for moderation."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image
+#: selection:mail.moderation,status:0
+msgid "Permanent Ban"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_mail__auto_delete
+#: model:ir.model.fields,help:mail.field_mail_template__auto_delete
+msgid "Permanently delete this email after sending it, to save space"
+msgstr "送信後、このEメールを削除（スペース節約のため）"
+
+#. module: mail
+#: 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
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Pivot"
+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
 msgid "Placeholder Expression"
 msgstr "プレースホルダ表現"
 
 #. module: mail
-#: selection:account.invoice,activity_state:0
-#: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
-#: selection:hr.applicant,activity_state:0 selection:mail.activity,state:0
+#: selection:mail.activity,state:0
 #: selection:mail.activity.mixin,activity_state:0
-#: selection:maintenance.equipment,activity_state:0
-#: selection:maintenance.request,activity_state:0
-#: selection:mrp.production,activity_state:0
-#: selection:mrp.repair,activity_state:0
-#: selection:mrp.unbuild,activity_state:0 selection:note.note,activity_state:0
-#: selection:product.product,activity_state:0
-#: selection:product.template,activity_state:0
-#: selection:project.task,activity_state:0
-#: selection:purchase.order,activity_state:0
 #: selection:res.partner,activity_state:0
-#: selection:sale.order,activity_state:0
-#: selection:stock.picking,activity_state:0
-#: selection:survey.survey,activity_state:0
 msgid "Planned"
 msgstr "予定済"
 
@@ -4052,47 +4096,54 @@ msgid "Planned activities"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:282
-#, python-format
-msgid "Play this video"
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
+msgid "Planned in"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:158
+#: code:addons/mail/static/src/js/composers/chatter_composer.js:123
 #, python-format
 msgid "Please complete customer's informations"
+msgstr "顧客の情報を埋めてください"
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Please contact us instead using"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:84
+#: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
-msgid "Please complete customer's informations and email"
+msgid "Please wait"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:651
+#: code:addons/mail/static/src/js/composers/basic_composer.js:242
 #, 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_mail_test_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"
@@ -4105,12 +4156,14 @@ msgstr ""
 "- followers: 関連ドキュメントのフォロワーか、フォローしているチャンネルのメンバーのみ\n"
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.message_user_assigned
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_light
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
 msgid "Powered by"
 msgstr "Powered by"
 
 #. 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 "先行する活動"
 
@@ -4120,13 +4173,18 @@ 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 "好ましい応答アドレス"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:70
+#: code:addons/mail/static/src/xml/discuss.xml:275
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:54
 #: model_terms:ir.ui.view,arch_db:mail.email_template_form
+#, python-format
 msgid "Preview"
 msgstr "プレビュー表示"
 
@@ -4136,32 +4194,51 @@ msgid "Preview of"
 msgstr "プレビュー:"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_previous_activity_type_id
-msgid "Previous Activity Type"
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:92
+#, python-format
+msgid "Previous"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_public
+#: model:ir.model.fields,field_description:mail.field_mail_activity__previous_activity_type_id
+msgid "Previous Activity Type"
+msgstr "前の活動タイプ"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:76
+#, python-format
+msgid "Print"
+msgstr "印刷"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__public
 #: model_terms: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:67
+#: code:addons/mail/static/src/xml/discuss.xml:228
 #, 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:1348
 #, python-format
 msgid "Public Channels"
 msgstr "パブリックチャネル"
 
 #. module: mail
+#: model:ir.model,name:mail.model_publisher_warranty_contract
+msgid "Publisher Warranty Contract"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.server,name:mail.ir_cron_module_update_notification_ir_actions_server
 #: model:ir.cron,cron_name:mail.ir_cron_module_update_notification
 #: model:ir.cron,name:mail.ir_cron_module_update_notification
@@ -4169,85 +4246,128 @@ msgid "Publisher: Update Notification"
 msgstr ""
 
 #. module: mail
+#: selection:ir.ui.view,type:0
+msgid "QWeb"
+msgstr "QWeb"
+
+#. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:179
 #, python-format
 msgid "Re:"
 msgstr "Re:"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:400
+#, python-format
+msgid "Ready"
+msgstr "準備完了"
+
+#. module: mail
 #: selection:mail.notification,email_status:0
 msgid "Ready to Send"
 msgstr "送信準備完了"
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
+#: selection:mail.mail,state:0
 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
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
 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_resend_message__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model_terms: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 ""
+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_test_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_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Regards,"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:186
+#, python-format
+msgid "Reject"
+msgstr "拒否"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:186
+#, python-format
+msgid "Reject selected messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:414
+#, python-format
+msgid "Reject |"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,moderation_status:0
+#: selection:mail.message,moderation_status:0
+msgid "Rejected"
+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
 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
 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 "関連ドキュメントモデル名"
 
@@ -4257,108 +4377,141 @@ 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 "関連項目"
 
 #. module: mail
+#: selection:mail.activity.type,category:0
+msgid "Reminder"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:414
+#, python-format
+msgid "Remove message with explanation"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:416
+#, python-format
+msgid "Remove message without explanation"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_template_form
 msgid "Remove the contextual action to use this template on related documents"
 msgstr "関連するドキュメントでこのテンプレートを使用するコンテキストアクションを削除する"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:51
+#: code:addons/mail/static/src/xml/followers.xml:53
 #, python-format
 msgid "Remove this follower"
 msgstr "このフォロワーを削除"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:203
+#: code:addons/mail/static/src/xml/thread.xml:343
 #: model_terms: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
 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
 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_mail_activity_mixin_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_note_note_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.actions.act_window,name:mail.mail_resend_message_action
+msgid "Resend mail"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid "Resend to selected"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__resend_wizard_id
+msgid "Resend wizard"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:69
+#, python-format
+msgid "Reset Zoom"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_user_id
 msgid "Responsible"
 msgstr "担当者"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
+msgid "Responsible User"
+msgstr "担当者"
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_tree
 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メッセージ"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:73
+#, python-format
+msgid "Rotate"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_email_template_search
 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 "サンプル文書"
 
@@ -4374,7 +4527,7 @@ msgstr "新しいテンプレートとして保存"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_window.js:40
+#: code:addons/mail/static/src/js/thread_windows/abstract_thread_window.js:63
 #, python-format
 msgid "Say something"
 msgstr "何か言う"
@@ -4386,31 +4539,42 @@ msgstr "スケジュール"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:60
+#: code:addons/mail/static/src/xml/chatter.xml:93
 #, python-format
 msgid "Schedule activity"
 msgstr "活動をスケジュール"
 
 #. module: mail
+#: code:addons/mail/models/mail_activity.py:395
+#, 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:82
 #, 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 "予定日"
+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_terms:ir.ui.view,arch_db:mail.email_template_form
 msgid "Scheduled Send Date"
 msgstr "予定送信日"
 
 #. module: mail
+#: selection:ir.ui.view,type:0
+msgid "Search"
+msgstr "検索"
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_search
 msgid "Search Alias"
 msgstr "エイリアス検索"
@@ -4421,8 +4585,27 @@ 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_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Search Moderation List"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:183
+#, python-format
+msgid "Select All"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:183
+#, python-format
+msgid "Select all messages to moderate"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__model_object_field
 msgid ""
 "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."
@@ -4431,57 +4614,94 @@ msgstr ""
 "それが関連項目である場合は、関係の目的として項目を選ぶことができます。"
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid ""
+"Select the action to do on each mail and correct the email address if "
+"needed. The modified address will be saved on the corresponding contact."
+msgstr ""
+
+#. module: mail
 #: selection:mail.channel,public:0
 msgid "Selected group of users"
 msgstr "選択されたグループ"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:374
+#: code:addons/mail/static/src/js/composers/basic_composer.js:49
+#: code:addons/mail/static/src/js/discuss.js:148
+#: code:addons/mail/static/src/xml/composer.xml:16
 #: model_terms: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_resend_partner__resend
+msgid "Send Again"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_partner_mass_mail
+#: selection:ir.actions.server,state:0
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail
 msgid "Send Email"
 msgstr "Eメール送信"
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:264
+#: code:addons/mail/models/mail_template.py:265
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Eメールを送信する (%s)"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:72
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_tree
+#, python-format
 msgid "Send Now"
 msgstr "今すぐ送信"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:53
+#: code:addons/mail/static/src/xml/chatter.xml:86
 #, python-format
 msgid "Send a message"
 msgstr "メッセージを送信"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:53
+#: code:addons/mail/static/src/js/discuss.js:145
+#, python-format
+msgid "Send explanation to author"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Send guidelines"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_guidelines
+msgid "Send guidelines to new subscribers"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:86
 #, python-format
 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 "Eメールでメッセージを送信"
 
 #. 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."
@@ -4490,46 +4710,47 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:91
 #, 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:141
 #, python-format
 msgid "Sends messages by email"
 msgstr "Eメールでメッセージを送信"
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0
-#: selection:mail.notification,email_status:0
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:397
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
+#: selection:mail.mail,state:0 selection:mail.notification,email_status:0
+#, python-format
 msgid "Sent"
 msgstr "送信日"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_email
+#: model_terms: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
-#, python-format
-msgid "Settings"
-msgstr "管理設定"
-
-#. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_shortcode_type
-msgid "Shortcode Type"
-msgstr ""
+#: model:ir.model,name:mail.model_ir_actions_server
+msgid "Server Action"
+msgstr "サーバアクション"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_shortcode_view_form
@@ -4538,7 +4759,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 "ショートカット"
 
@@ -4546,33 +4767,32 @@ msgstr "ショートカット"
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
 #: model_terms:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "次のアクションの日付が今日より前のすべてのレコードを表示する"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:667
+#: code:addons/mail/models/mail_channel.py:914
 #, 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
 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"
@@ -4581,12 +4801,12 @@ 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"
@@ -4596,12 +4816,12 @@ msgstr ""
 "小さな画像が必要な場所なら、このフィールドを使用します。"
 
 #. module: mail
-#: selection:mail.shortcode,shortcode_type:0
-msgid "Smiley"
-msgstr "スマイリー"
+#: selection:ir.actions.server,activity_user_type:0
+msgid "Specific User"
+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."
@@ -4609,70 +4829,39 @@ 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/xml/thread.xml:47
+#, python-format
+msgid "Split"
+msgstr "分割"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/services/mail_manager.js:1237
+#: code:addons/mail/static/src/xml/discuss.xml:33
+#: code:addons/mail/static/src/xml/discuss.xml:208
+#: 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
 #, 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_mail_activity_mixin_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_state
-#: model:ir.model.fields,field_description:mail.field_note_note_activity_state
-#: model:ir.model.fields,field_description:mail.field_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 "都道府県・州"
+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.model.fields,field_description:mail.field_mail_moderation__status
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
 #: model_terms: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_mail_activity_mixin_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_repair_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_activity_state
-#: model:ir.model.fields,help:mail.field_note_note_activity_state
-#: model:ir.model.fields,help:mail.field_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_mail_activity_mixin__activity_state
+#: model:ir.model.fields,help:mail.field_res_partner__activity_state
 msgid ""
 "Status based on activities\n"
 "Overdue: Due date is already passed\n"
@@ -4681,33 +4870,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
+#: code:addons/mail/static/src/xml/discuss.xml:197
+#: 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
 #, 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_terms:ir.ui.view,arch_db:mail.email_template_form
 msgid "Subject (placeholders may be used here)"
 msgstr "件名"
@@ -4719,22 +4908,21 @@ msgstr "件名..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:216
+#: code:addons/mail/static/src/xml/thread.xml:365
 #, 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_1986
-#: 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_terms:ir.ui.view,arch_db:mail.view_message_subtype_tree
 msgid "Subtype"
 msgstr "サブタイプ"
@@ -4746,24 +4934,41 @@ 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_ir_actions_server__activity_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 "サマリ"
 
 #. module: mail
 #: selection:mail.compose.message,message_type:0
 #: selection:mail.message,message_type:0
-#: selection:survey.mail.compose.message,message_type:0
 msgid "System notification"
 msgstr "システム通知"
 
 #. 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 ""
 
 #. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_change
+msgid "Technical field for UX related behaviour"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_type__initial_res_model_id
+msgid ""
+"Technical field to keep trace of the model at the beginning of the edition "
+"for UX related behaviour"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_ir_actions_server__activity_user_field_name
+msgid "Technical name of the user on the record"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.wizard_email_template_preview
 msgid "Template Preview"
 msgstr "テンプレートを表示"
@@ -4778,25 +4983,40 @@ msgid "Templates"
 msgstr "テンプレート"
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_test
-msgid "Test Mail Model"
-msgstr "テストメールモデル"
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+msgid "Thank you!"
+msgstr "回答にご協力頂き、誠に有難う御座います！"
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The"
+msgstr "・"
+
+#. module: mail
+#: code:addons/mail/models/ir_actions.py:51
+#, python-format
+msgid "The 'Due Date In' value can't be negative."
+msgstr ""
+
+#. module: mail
+#: sql_constraint:mail.moderation:0
+msgid "The email address must be unique per channel !"
+msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_test_simple
-msgid "Test Simple Chatter Record"
+#: model_terms: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
+#: 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_test_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 "
@@ -4805,20 +5025,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_test_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 "eメールのエイリアス.例えば<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_test_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 "
@@ -4828,9 +5046,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:243
+#: code:addons/mail/models/mail_message.py:704
+#: code:addons/mail/models/mail_message.py:874
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -4842,18 +5060,13 @@ 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
-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 "このテンプレートを使用できるドキュメントのタイプ"
 
@@ -4863,14 +5076,26 @@ msgid "This"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity_view.xml:10
+#, python-format
+msgid "This action will send an email."
+msgstr ""
+
+#. module: mail
+#: 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_blacklist__email
+msgid "This field is case insensitive."
+msgstr ""
+
+#. module: mail
+#: 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."
@@ -4882,53 +5107,44 @@ 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 "移動先"
+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 "宛先 (Eメール)"
 
 #. 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 "宛先 (取引先)"
 
 #. module: mail
+#: model:mail.activity.type,name:mail.mail_activity_data_todo
+msgid "To Do"
+msgstr "未処理"
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:14
-#: code:addons/mail/static/src/xml/extended_chat_window.xml:7
+#: code:addons/mail/static/src/xml/chatter.xml:39
+#: code:addons/mail/static/src/xml/thread_window.xml:10
 #, python-format
 msgid "To:"
 msgstr "To:"
 
 #. module: mail
 #. openerp-web
-#: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:26
-#: code:addons/mail/static/src/js/thread.js:240
-#: code:addons/mail/static/src/xml/systray.xml:75
-#: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
-#: selection:hr.applicant,activity_state:0 selection:mail.activity,state:0
+#: code:addons/mail/static/src/js/activity.js:83
+#: code:addons/mail/static/src/js/models/messages/abstract_message.js:107
+#: code:addons/mail/static/src/xml/systray.xml:96
+#: selection:mail.activity,state:0
 #: selection:mail.activity.mixin,activity_state:0
-#: selection:maintenance.equipment,activity_state:0
-#: selection:maintenance.request,activity_state:0
-#: selection:mrp.production,activity_state:0
-#: selection:mrp.repair,activity_state:0
-#: selection:mrp.unbuild,activity_state:0 selection:note.note,activity_state:0
-#: selection:product.product,activity_state:0
-#: selection:product.template,activity_state:0
-#: selection:project.task,activity_state:0
-#: selection:purchase.order,activity_state:0
 #: selection:res.partner,activity_state:0
-#: selection:sale.order,activity_state:0
-#: selection:stock.picking,activity_state:0
-#: selection:survey.survey,activity_state:0
 #, python-format
 msgid "Today"
 msgstr "本日"
@@ -4940,13 +5156,8 @@ msgid "Today Activities"
 msgstr "本日の活動"
 
 #. module: mail
-#: model:mail.activity.type,name:mail.mail_activity_data_todo
-msgid "Todo"
-msgstr "Todo"
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:36
+#: code:addons/mail/static/src/js/activity.js:93
 #, python-format
 msgid "Tomorrow"
 msgstr "明日"
@@ -4957,17 +5168,16 @@ 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
 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_terms:ir.ui.view,arch_db:mail.view_message_form
 msgid "Tracking"
 msgstr "追跡"
@@ -4985,41 +5195,95 @@ 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_tracking_value__track_sequence
+msgid "Tracking field sequence"
+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
 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
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Tree"
+msgstr "ツリー"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity_view.xml:23
+#, python-format
+msgid ""
+"Try to add some activity on records, or make sure that\n"
+"                there is no active filter in the search bar."
+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_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
 msgid "Type"
 msgstr "タイプ"
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_uuid
+#: model:ir.model.fields,help:mail.field_mail_activity_type__delay_from
+msgid "Type of delay"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_ir_actions_server__state
+msgid ""
+"Type of server action. The following values are available:\n"
+"- 'Execute Python Code': a block of python code that will be executed\n"
+"- 'Create or Copy a new Record': create a new record with new values, or copy an existing record in your database\n"
+"- 'Write on a Record': update the values of a record\n"
+"- 'Execute several actions': define an action that triggers several other server actions\n"
+"- 'Add Followers': add followers to a record (available in Discuss)\n"
+"- 'Send Email': automatically send an email (available in email_template)"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__uuid
 msgid "UUID"
 msgstr "UUID"
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:235
+#: code:addons/mail/models/mail_mail.py:241
 #, python-format
 msgid "Unable to connect to SMTP Server"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_message.py:31
+#: code:addons/mail/models/mail_thread.py:2207
+#, python-format
+msgid "Unable to log message, please configure the sender's email address."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:2172
 #, python-format
-msgid "Unable to send email, please configure the sender's email address."
-msgstr "メールを送信できない場合は、送信者のメールアドレスを設定してください。"
+msgid "Unable to notify message, please configure the sender's email address."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_message.py:34
+#, python-format
+msgid "Unable to post message, please configure the sender's email address."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread_windows/abstract_thread_window.js:163
+#, python-format
+msgid "Undefined"
+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"
@@ -5032,200 +5296,134 @@ msgid ""
 msgstr "残念ながらこのメールエイリアスは既に使用されています。ユニークなものを選択してください"
 
 #. module: mail
-#: 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_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
+msgid "Unit"
+msgstr "単位"
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_type__delay_unit
+msgid "Unit of delay"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_notification.py:52
+#: selection:mail.notification,failure_type:0
+#, python-format
+msgid "Unknown error"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_partner__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_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_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_mail_blacklist__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_thread__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
 msgid "Unread Messages Counter"
 msgstr "未読メッセージカウンター"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/abstract_thread_window.xml:35
 #: model_terms:ir.ui.view,arch_db:mail.view_message_search
+#, python-format
 msgid "Unread messages"
 msgstr "未読メッセージ"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:184
+#, python-format
+msgid "Unselect All"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:184
+#, python-format
+msgid "Unselect all messages to moderate"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:180
 #, 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:180
 #, 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/js/discuss.js:341
 #, python-format
 msgid "Unsubscribe"
 msgstr "購読解除"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/models/mail_template.py:473
 #, python-format
-msgid "Unsubscribe from channel"
-msgstr "チャネルから退会する"
+msgid "Unsupported report type %s found."
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:510
+#: code:addons/mail/models/mail_message.py:188
 #, python-format
-msgid "Unsupported report type %s found."
+msgid "Unsupported search filter on moderation status"
+msgstr ""
+
+#. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Update the Record"
+msgstr "レコードを更新"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:531
+#, python-format
+msgid "Uploaded"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:322
+#: code:addons/mail/static/src/xml/thread.xml:523
 #, python-format
 msgid "Uploading"
 msgstr "アップロード"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:651
+#: code:addons/mail/static/src/js/composers/basic_composer.js:242
 #, 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,help:mail.field_ir_actions_server__activity_user_type
+msgid ""
+"Use 'Specific User' to always assign the same user on the next activity. Use"
+" 'Generic User From Record' to specify the field name of the user to choose "
+"on the record."
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_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
 msgid "Use template"
 msgstr "テンプレートを使用"
 
@@ -5235,21 +5433,29 @@ msgid "Use your own email servers"
 msgstr "自分のEメールサーバを使用"
 
 #. 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 "サブタイプのオーダーに使用されます。"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:61
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_search
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_tree
+#, python-format
 msgid "User"
 msgstr "ユーザ"
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_user_field_name
+msgid "User field name"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:51
-#: code:addons/mail/static/src/xml/extended_chat_window.xml:8
+#: code:addons/mail/static/src/xml/discuss.xml:62
+#: code:addons/mail/static/src/xml/thread_window.xml:11
 #, python-format
 msgid "User name"
 msgstr ""
@@ -5260,7 +5466,7 @@ msgid "Users"
 msgstr "ユーザ"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:711
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "このチャンネルのユーザ %s %s と、あなた。"
@@ -5274,21 +5480,58 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:670
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:41
+#, python-format
+msgid "Video"
+msgstr "ビデオ"
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:747
+#: model:ir.model,name:mail.model_ir_ui_view
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
+#: model_terms:ir.ui.view,arch_db:mail.message_activity_assigned
 #: model_terms: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:745
 #, python-format
 msgid "View %s"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_act_window_view__view_mode
+#: model:ir.model.fields,field_description:mail.field_ir_ui_view__type
+msgid "View Type"
+msgstr "ビュータイプ"
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:240
+#: code:addons/mail/static/src/xml/chatter.xml:99
+#, python-format
+msgid "View all the attachments of the current record"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:57
+#, python-format
+msgid "Viewer"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/followers.xml:85
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/followers.js:243
 #, python-format
 msgid ""
 "Warning! \n"
@@ -5299,35 +5542,39 @@ 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
+#: selection:ir.actions.server,activity_date_deadline_range_type:0
+msgid "Weeks"
+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
 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
 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 ""
 
@@ -5338,7 +5585,7 @@ msgstr "フォロー許可対象"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:75
+#: code:addons/mail/static/src/xml/activity.xml:96
 #, python-format
 msgid "Write Feedback"
 msgstr ""
@@ -5352,47 +5599,84 @@ msgstr "メッセージ/メモはこちら..."
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:30
-#: code:addons/mail/static/src/js/thread.js:242
+#: code:addons/mail/static/src/js/activity.js:87
+#: code:addons/mail/static/src/js/models/messages/abstract_message.js:109
 #, 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:101
 #, 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:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "あなたはこのチャンネルに一人でいます。"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:677
+#. openerp-web
+#: code:addons/mail/static/src/js/discuss.js:367
+#, python-format
+msgid "You are going to ban: %s. Do you confirm the action?"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/discuss.js:390
+#, python-format
+msgid "You are going to discard %s messages. Do you confirm the action?"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/discuss.js:394
+#, python-format
+msgid "You are going to discard 1 message. Do you confirm the action?"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid ""
+"You are going to send the guidelines to all the subscribers. Do you confirm "
+"the action?"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:925
 #, 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:919
 #, 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/js/discuss.js:338
 #, python-format
 msgid ""
-"You can mark any message as 'starred', and it shows up in this channel."
-msgstr "どのメッセージにも「スター付き」とマークすることができ、このメッセージはこのチャンネルに表示されます。"
+"You are the administrator of this channel. Are you sure you want to "
+"unsubscribe?"
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:53
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:135
+#, python-format
+msgid ""
+"You can mark any message as 'starred', and it shows up in this mailbox."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/res_users.py:87
 #, python-format
 msgid ""
 "You cannot create a new user from here.\n"
@@ -5402,7 +5686,7 @@ msgstr ""
 "  新しいユーザーを作成するには、設定パネルにアクセスしてください。"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:144
+#: code:addons/mail/models/mail_channel.py:241
 #, python-format
 msgid ""
 "You cannot delete those groups, as the Whole Company group is required by "
@@ -5410,28 +5694,32 @@ msgid ""
 msgstr "グループ全体が他のモジュールで必要とされるため、これらのグループを削除することはできません。"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:349
-#, 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を追加することもできます。"
-
-#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_user_assigned
 msgid "You have been assigned to the"
 msgstr "あなたに割り当てられています・"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/mail_notification_manager.js:198
 #, 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_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+msgid "You have messages to moderate, please go for the proceedings."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:138
+#, python-format
+msgid "You have no message to moderate"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_template__attachment_ids
 msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
@@ -5439,61 +5727,130 @@ msgstr "このテンプレートにファイルを添付できます。（この
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:473
+#: code:addons/mail/static/src/js/services/mail_notification_manager.js:444
 #, 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/mail_notification_manager.js:439
 #, 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:291
 #, python-format
 msgid "You:"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_light
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
+msgid "Your"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:91
 #, python-format
 msgid "Your message has not been sent."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/ir_actions.py:30
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:424
+#, python-format
+msgid "Your message is pending moderation"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:198
+#, python-format
+msgid "Your message was rejected by moderator."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/ir_actions.py:57
 #, python-format
 msgid "Your template should define email_from"
 msgstr "テンプレートに差出人を設定してください。"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:68
+#, python-format
+msgid "Zoom In"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:70
+#, python-format
+msgid "Zoom Out"
+msgstr ""
+
+#. module: mail
+#: selection:mail.activity.type,delay_from:0
+msgid "after previous activity deadline"
+msgstr ""
+
+#. module: mail
+#: selection:mail.activity.type,delay_from:0
+msgid "after validation date"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:1074
 #, python-format
 msgid "alias %s: %s"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.message_activity_assigned
+msgid "assigned you an activity"
+msgstr ""
+
+#. module: mail
 #: model:mail.channel,name:mail.channel_2
 msgid "board-meetings"
 msgstr "ボードミーティング"
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
+#, python-format
 msgid "by"
 msgstr ""
 
 #. module: mail
+#: model_terms: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_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:315
+#: selection:mail.activity.type,delay_unit:0
+msgid "days"
+msgstr "日"
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:357
 #, python-format
 msgid "document"
 msgstr "ドキュメント"
@@ -5506,20 +5863,21 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:45
+#, python-format
+msgid "e.g. 1-5, 7, 8-9"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model_terms:ir.ui.view,arch_db:mail.view_server_action_form_template
 msgid "e.g. Discuss proposal"
 msgstr "例: 提案内容説明"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
-#, python-format
-msgid "enable desktop notifications"
-msgstr "デスクトップ通知を有効化"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:189
+#: code:addons/mail/static/src/js/followers.js:190
 #, python-format
 msgid "followers"
 msgstr "フォロワー"
@@ -5547,46 +5905,31 @@ msgid "has been"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:282
+#: code:addons/mail/models/mail_alias.py:272
 #, python-format
 msgid "incorrectly configured alias"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:278
+#: code:addons/mail/models/mail_alias.py:268
 #, python-format
 msgid "incorrectly configured alias (unknown reference record)"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_ir_actions_server
-msgid "ir.actions.server"
-msgstr "ir.actions.server"
-
-#. module: mail
-#: model:ir.model,name:mail.model_ir_autovacuum
-msgid "ir.autovacuum"
-msgstr "ir.autovacuum"
-
-#. module: mail
-#: model:ir.model,name:mail.model_mail_alias_mixin
-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:1051
 #, 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:1046
 #, 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:1039
 #, python-format
 msgid ""
 "model %s does not accept document update, fall back on document creation"
@@ -5598,27 +5941,41 @@ msgid "modified"
 msgstr "変更済"
 
 #. module: mail
+#: selection:mail.activity.type,delay_unit:0
+msgid "months"
+msgstr "ヶ月"
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
 msgid "mycompany.odoo.com"
 msgstr "mycompany.odoo.com"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread.js:21
+#: code:addons/mail/static/src/js/utils.js:108
 #, python-format
 msgid "now"
 msgstr "今"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:177
+#: code:addons/mail/static/src/xml/thread.xml:323
+#: model_terms:ir.ui.view,arch_db:mail.message_activity_assigned
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "on"
 msgstr "on"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:71
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:55
+#, python-format
+msgid "or"
+msgstr "または"
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:1021
 #, python-format
 msgid ""
 "posting a message without model should be with a null res_id (private "
@@ -5626,32 +5983,27 @@ msgid ""
 msgstr "モデルなしでメッセージを投稿するには、%sを受信したnull res_id(プライベートメッセージ)を使用する必要があります"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:917
+#: code:addons/mail/models/mail_thread.py:1025
 #, python-format
 msgid ""
 "posting a message without model should be with a parent_id (private message)"
 msgstr "モデルなしでメッセージを投稿するには、parent_id(プライベートメッセージ)を使用する必要があります"
 
 #. module: mail
-#: model:ir.model,name:mail.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#. module: mail
 #: model:mail.channel,name:mail.channel_3
 msgid "rd"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread.js:17
+#: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
 msgid "read less"
 msgstr "全文表示解除"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread.js:16
+#: code:addons/mail/static/src/js/thread_widget.js:19
 #, python-format
 msgid "read more"
 msgstr "さらに読む"
@@ -5662,42 +6014,37 @@ msgid "record:"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:935
+#: code:addons/mail/models/mail_thread.py:1043
 #, 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:1036
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
 msgstr "不足しているドキュメント(%s,%s)に返信し、新しいドキュメントの作成に戻る"
 
 #. module: mail
-#: model:ir.model,name:mail.model_res_config_settings
-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:1021
 #, 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:407
 #, 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:277
 #, python-format
 msgid "restricted to followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:291
+#: code:addons/mail/models/mail_alias.py:281
 #, python-format
 msgid "restricted to known authors"
 msgstr ""
@@ -5708,30 +6055,50 @@ msgid "sales"
 msgstr "販売"
 
 #. module: mail
-#: 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:1025
+#: code:addons/mail/models/mail_thread.py:1043
+#: code:addons/mail/models/mail_thread.py:1046
+#: code:addons/mail/models/mail_thread.py:1051
+#: code:addons/mail/models/mail_thread.py:1074
 #, python-format
 msgid "skipping"
 msgstr "スキップ"
 
 #. module: mail
+#: model_terms: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
+#: code:addons/mail/static/src/xml/chatter.xml:45
 #, python-format
 msgid "this document"
 msgstr "このドキュメント"
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: model_terms:ir.ui.view,arch_db:mail.message_activity_assigned
+msgid "to close for"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:1074
 #, python-format
 msgid "unknown error"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:906
+#: code:addons/mail/models/mail_thread.py:1014
 #, python-format
 msgid "unknown target model %s"
 msgstr "不明なターゲットモデル %s"
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.message_notification_email
+msgid "using"
+msgstr ""
+
+#. module: mail
+#: selection:mail.activity.type,delay_unit:0
+msgid "weeks"
+msgstr ""
diff --git a/addons/mail/i18n/km.po b/addons/mail/i18n/km.po
index 7e6cd09f7de..95da6d1fd45 100644
--- a/addons/mail/i18n/km.po
+++ b/addons/mail/i18n/km.po
@@ -10,10 +10,10 @@
 # AN Souphorn <ansouphorn@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: AN Souphorn <ansouphorn@gmail.com>, 2018\n"
 "Language-Team: Khmer (https://www.transifex.com/odoo/teams/41243/km/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr "បន្ទប់ជជែកពិភាក្សាឯកជន។ អាចចូលរួមតាមរយៈការអញ្ជើញ។"
@@ -136,21 +136,7 @@ msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -161,7 +147,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -170,7 +156,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -178,8 +164,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -712,7 +698,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2266,8 +2252,9 @@ msgid "Guidelines"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2314,6 +2301,7 @@ msgstr ""
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2548,7 +2536,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2802,7 +2791,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2821,7 +2810,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
@@ -4084,6 +4073,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4729,7 +4723,7 @@ msgid "Show all records which has next action date is before today"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr ""
@@ -5417,7 +5411,7 @@ msgid "Users"
 msgstr "អ្នកប្រើ"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5562,7 +5556,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr ""
@@ -5596,13 +5590,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr ""
@@ -5762,6 +5756,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5777,6 +5776,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr ""
@@ -5927,6 +5931,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -5982,6 +5991,11 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/mn.po b/addons/mail/i18n/mn.po
index 2fc616bb057..86ad93bc046 100644
--- a/addons/mail/i18n/mn.po
+++ b/addons/mail/i18n/mn.po
@@ -5,13 +5,14 @@
 # Translators:
 # Martin Trigaux, 2018
 # Khishigbat Ganbold <khishigbat@asterisk-tech.mn>, 2018
+# Otgonbayar.A <gobi.mn@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
-"Last-Translator: Khishigbat Ganbold <khishigbat@asterisk-tech.mn>, 2018\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
+"Last-Translator: Otgonbayar.A <gobi.mn@gmail.com>, 2018\n"
 "Language-Team: Mongolian (https://www.transifex.com/odoo/teams/41243/mn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr " Энэ хувийн суваг. Хүн холбогдохын тулд уригдах ёстой."
@@ -133,21 +134,7 @@ msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -158,7 +145,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -167,7 +154,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -177,8 +164,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -736,7 +723,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2323,8 +2310,9 @@ msgid "Guidelines"
 msgstr "Удирдамж"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2371,6 +2359,7 @@ msgstr "Толгой хэсэг"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2622,7 +2611,8 @@ msgstr ""
 "тухайлбал \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2878,7 +2868,7 @@ msgstr "Амралт, Чөлөө"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2897,7 +2887,7 @@ msgid ""
 msgstr "Одоогийн баримтын дагагчаар нэмэгдэх харилцагчдийн жагсаалт."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr "Одоогийн суваг дахь хэрэглэгчдийн жагсаалт"
@@ -4196,6 +4186,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4852,7 +4847,7 @@ msgid "Show all records which has next action date is before today"
 msgstr "Өнөөдрөөс өмнө дараагийн арга хэмжээг товлосон бүх рекордыг харуулах"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "Туслах зурвасыг харуулах"
@@ -5567,7 +5562,7 @@ msgid "Users"
 msgstr "Хэрэглэгчид"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Энэ суваг дахь хэрэглэгчид: %s%s болон та."
@@ -5720,7 +5715,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr "Та <b>%s</b>-г хөөрөлдөөнд нэмлээ."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Энэ сувагт та ганцаараа байна."
@@ -5754,13 +5749,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, 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:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Та <b>#%s</b> сувагт байна."
@@ -5924,6 +5919,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "уулзалтын-самбар"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5939,6 +5939,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "үүсгэгдсэн"
@@ -6094,6 +6099,11 @@ msgstr ""
 "моделгүйгээр зурвас илгээх нь parent_id (хувийн зурвас) -тай байх ёстой"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "rd"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6150,6 +6160,11 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "борлуулалт"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/nb.po b/addons/mail/i18n/nb.po
index a7d68eb6d8d..3f6ffd12ff8 100644
--- a/addons/mail/i18n/nb.po
+++ b/addons/mail/i18n/nb.po
@@ -7,10 +7,10 @@
 # Jorunn D. Newth, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Jorunn D. Newth, 2018\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr "Kanalen er privat. Folk må inviteres for å kunne bli med."
@@ -133,21 +133,7 @@ msgid "0 Today"
 msgstr "0 i dag"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -158,7 +144,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -167,7 +153,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -177,8 +163,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -723,7 +709,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2292,8 +2278,9 @@ msgid "Guidelines"
 msgstr "Retningslinjer"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2340,6 +2327,7 @@ msgstr "Topptekster"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2576,7 +2564,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2830,7 +2819,7 @@ msgstr "Forlat"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2849,7 +2838,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr "List brukere i denne kanalen"
@@ -4121,6 +4110,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4774,7 +4768,7 @@ msgid "Show all records which has next action date is before today"
 msgstr "Vis alle oppføringer som har en neste tiltak-dato før dagen i dag"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "Vis en hjelpemelding"
@@ -5475,7 +5469,7 @@ msgid "Users"
 msgstr "Brukere"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Brukere i denne kanalen: %s %s og deg."
@@ -5624,7 +5618,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr "Du la til <b>%s</b> i samtalen."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Du er alene i denne kanalen."
@@ -5658,13 +5652,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "Du er i en privat samtale med <b>@%s</b>."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Du er i kanalen <b>#%s</b>."
@@ -5828,6 +5822,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "styremøter"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5843,6 +5842,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "opprettet"
@@ -5995,6 +5999,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "rd"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6050,6 +6059,11 @@ msgid "restricted to known authors"
 msgstr "avgrenset til kjente forfattere"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "salg"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index 332b322bef4..7fb01389571 100644
--- a/addons/mail/i18n/nl.po
+++ b/addons/mail/i18n/nl.po
@@ -10,13 +10,14 @@
 # Wynand Tastenhoye <wta@odoo.com>, 2018
 # Gunther Clauwaert <gclauwae@hotmail.com>, 2018
 # Thomas Pot <thomas@open2bizz.nl>, 2018
+# Cas Vissers <casvissers@brahoo.nl>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
-"Last-Translator: Thomas Pot <thomas@open2bizz.nl>, 2018\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
+"Last-Translator: Cas Vissers <casvissers@brahoo.nl>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, 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."
@@ -55,7 +56,7 @@ msgstr "%s (kopie)"
 #: code:addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js:133
 #, python-format
 msgid "%s and %s are typing..."
-msgstr ""
+msgstr "%s en %s zijn aan het typen..."
 
 #. module: mail
 #: code:addons/mail/models/mail_thread.py:278
@@ -68,14 +69,14 @@ msgstr "%s aangemaakt"
 #: code:addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js:131
 #, python-format
 msgid "%s is typing..."
-msgstr ""
+msgstr "%s is aan het typen..."
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js:137
 #, python-format
 msgid "%s, %s and more are typing..."
-msgstr ""
+msgstr "%s, %s en meer zijn aan het typen..."
 
 #. module: mail
 #: code:addons/mail/models/mail_activity.py:341
@@ -138,21 +139,7 @@ msgid "0 Today"
 msgstr "0 Vandaag"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -163,7 +150,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -175,7 +162,7 @@ msgstr ""
 "id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -185,8 +172,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -269,7 +256,7 @@ msgstr ""
 #: code:addons/mail/static/src/js/models/threads/create_mode_document_thread.js:65
 #, python-format
 msgid "<p>Creating a new record...</p>"
-msgstr ""
+msgstr "<p>Nieuw record aanmaken...</p>"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
@@ -551,7 +538,7 @@ msgstr "Voeg kanalen toe"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_form
 msgid "Add Email Blacklist"
-msgstr ""
+msgstr "Voeg e-mail blacklist toe"
 
 #. module: mail
 #. openerp-web
@@ -761,7 +748,7 @@ msgstr "Er is een fout opgetreden bij het verzenden van een e-mail"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -946,7 +933,7 @@ msgstr "Geautomatiseerde activiteit"
 #. module: mail
 #: model:ir.model,name:mail.model_ir_autovacuum
 msgid "Automatic Vacuum"
-msgstr ""
+msgstr "Automatisch vacuum"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_notify
@@ -1003,12 +990,12 @@ msgstr "Met vriendelijk groet,"
 #: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_blacklisted
 #: model:ir.model.fields,field_description:mail.field_res_partner__is_blacklisted
 msgid "Blacklist"
-msgstr ""
+msgstr "Blacklist"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_tree
 msgid "Blacklist Date"
-msgstr ""
+msgstr "Blacklist datum"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview__body_html
@@ -1164,7 +1151,7 @@ msgstr "Kanaal bericht"
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_moderation_menu
 msgid "Channel Moderation"
-msgstr ""
+msgstr "Kanaal moderatie"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel__channel_type
@@ -1204,7 +1191,7 @@ msgstr "Kanalen"
 #: model:ir.actions.act_window,name:mail.mail_channel_partner_action
 #: model:ir.ui.menu,name:mail.mail_channel_partner_menu
 msgid "Channels/Partner"
-msgstr "Kanalen/Partners"
+msgstr "Kanalen/Relatie"
 
 #. module: mail
 #. openerp-web
@@ -1329,7 +1316,7 @@ msgstr "Configureer uw soorten activiteiten"
 #: code:addons/mail/static/src/xml/thread.xml:130
 #, python-format
 msgid "Congratulations, your inbox is empty"
-msgstr "Proficiat, uw inbox is leeg"
+msgstr "Gefeliciteerd, uw inbox is leeg"
 
 #. module: mail
 #. openerp-web
@@ -1530,7 +1517,7 @@ msgstr "Beste"
 #: model:ir.model.fields,field_description:mail.field_mail_activity__activity_decoration
 #: model:ir.model.fields,field_description:mail.field_mail_activity_type__decoration_type
 msgid "Decoration Type"
-msgstr ""
+msgstr "Decoratie type"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype__default
@@ -1540,7 +1527,7 @@ msgstr "Standaard"
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_activity_type__default_next_type_id
 msgid "Default Next Activity"
-msgstr ""
+msgstr "Standaard volgende activitiet"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview__null_value
@@ -1586,7 +1573,7 @@ msgstr "Soort vertraging"
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_activity_type__delay_unit
 msgid "Delay units"
-msgstr ""
+msgstr "Vertraging eenheden"
 
 #. module: mail
 #. openerp-web
@@ -1788,7 +1775,7 @@ msgstr "Gereed"
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
 #, python-format
 msgid "Done & Launch Next"
-msgstr ""
+msgstr "Voltooid & start volgende"
 
 #. module: mail
 #. openerp-web
@@ -2093,7 +2080,7 @@ msgstr "Uitgebreide filters..."
 #: code:addons/mail/static/src/xml/thread.xml:45
 #, python-format
 msgid "Extract pages:&nbsp;"
-msgstr ""
+msgstr "Extract paginas:&nbsp;"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_res_config_settings__fail_counter
@@ -2238,7 +2225,7 @@ msgstr "Volgers (Kanalen)"
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
 msgid "Followers (Partners)"
-msgstr "Volgers (Partners)"
+msgstr "Volgers (Relaties)"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_subscription_form
@@ -2290,7 +2277,7 @@ msgstr "Van"
 #: code:addons/mail/static/src/xml/chatter.xml:73
 #, python-format
 msgid "Full composer"
-msgstr ""
+msgstr "Volledige composer"
 
 #. module: mail
 #. openerp-web
@@ -2356,9 +2343,10 @@ msgid "Guidelines"
 msgstr "Regels"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
-msgstr "Regels van kanaal ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
+msgstr "Regels van het kanaal %s"
 
 #. module: mail
 #: selection:res.users,notification_type:0
@@ -2404,6 +2392,7 @@ msgstr "Kopteksten"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr "Hallo"
 
@@ -2555,6 +2544,8 @@ msgid ""
 "If the email address is on the blacklist, the contact won't receive mass "
 "mailing anymore, from any list"
 msgstr ""
+"Als het e-mail adres op de blacklist staat, zal het contact gen "
+"bulkmailingen ontvangen, van geen enkele lijst."
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
@@ -2655,7 +2646,8 @@ msgstr ""
 "zijn, bijvoorbeeld:  \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2911,7 +2903,7 @@ msgstr "Verlof"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2934,7 +2926,7 @@ msgstr ""
 "document."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr "Lijst van gebruikers in het huidige kanaal"
@@ -3223,7 +3215,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
 msgid "Merge Partner Wizard"
-msgstr ""
+msgstr "Relaties samenvoegen wizar"
 
 #. module: mail
 #: code:addons/mail/wizard/base_partner_merge.py:13
@@ -3401,7 +3393,7 @@ msgstr "Model"
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_activity_type__res_model_change
 msgid "Model has change"
-msgstr ""
+msgstr "Model heeft verandering"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_wizard_invite__res_model
@@ -3734,7 +3726,7 @@ msgstr "Geen overeenkomsten gevonden"
 #: code:addons/mail/static/src/js/tools/debug_manager.js:17
 #, python-format
 msgid "No message available"
-msgstr ""
+msgstr "Geen bericht beschikbaar"
 
 #. module: mail
 #. openerp-web
@@ -4184,7 +4176,7 @@ msgstr ""
 #. module: mail
 #: selection:mail.moderation,status:0
 msgid "Permanent Ban"
-msgstr ""
+msgstr "Permanente ban"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
@@ -4243,6 +4235,11 @@ msgid "Please contact us instead using"
 msgstr "Gelieve ons in de plaats te contacteren door middel van"
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4362,7 +4359,7 @@ msgstr "Openbare kanalen"
 #. module: mail
 #: model:ir.model,name:mail.model_publisher_warranty_contract
 msgid "Publisher Warranty Contract"
-msgstr ""
+msgstr "Uitgever garantie contract"
 
 #. module: mail
 #: model:ir.actions.server,name:mail.ir_cron_module_update_notification_ir_actions_server
@@ -4714,7 +4711,7 @@ msgstr "Zoek groepen"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
 msgid "Search Moderation List"
-msgstr ""
+msgstr "Zoek moderatie lijst"
 
 #. module: mail
 #. openerp-web
@@ -4802,7 +4799,7 @@ msgstr "Bericht versturen"
 #: code:addons/mail/static/src/js/discuss.js:145
 #, python-format
 msgid "Send explanation to author"
-msgstr ""
+msgstr "Verstuur uitleg naar auteur"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
@@ -4899,7 +4896,7 @@ 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:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "Geen een help bericht weer"
@@ -5103,6 +5100,8 @@ msgid ""
 "Technical field to keep trace of the model at the beginning of the edition "
 "for UX related behaviour"
 msgstr ""
+"Technisch veld om het model aan het begin van de bewerken te volgen voor UX "
+"gerelateerd gedrag"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_ir_actions_server__activity_user_field_name
@@ -5580,6 +5579,9 @@ msgid ""
 " 'Generic User From Record' to specify the field name of the user to choose "
 "on the record."
 msgstr ""
+"Gebruik 'Specifieke gebruiker' om altijd dezelfde gebruiker toe te wijzen "
+"aan de volgende activiteit. Gebruik 'Generieke gebruiker van record' om het "
+"veldnaam op te geven van de gebruiker die in de record moet worden gekozen."
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
@@ -5630,7 +5632,7 @@ msgid "Users"
 msgstr "Gebruikers"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Gebruikers in dit kanaal: %s %s en u."
@@ -5787,7 +5789,7 @@ 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:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "U bent alleen in dit kanaal."
@@ -5821,13 +5823,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, 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:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "U bent in kanaal <b>#%s</b>."
@@ -5891,7 +5893,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/thread.xml:138
 #, python-format
 msgid "You have no message to moderate"
-msgstr ""
+msgstr "U heeft geen berichten om te modereren"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_email_template_preview__attachment_ids
@@ -5974,7 +5976,7 @@ msgstr "Uitzoomen"
 #. module: mail
 #: selection:mail.activity.type,delay_from:0
 msgid "after previous activity deadline"
-msgstr ""
+msgstr "na vorige activiteit deadline"
 
 #. module: mail
 #: selection:mail.activity.type,delay_from:0
@@ -5993,6 +5995,11 @@ msgid "assigned you an activity"
 msgstr "heeft u een activiteit toegewezen"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "Bestuursvergaderingen"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -6008,6 +6015,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr "kanaal."
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "aangemaakt"
@@ -6165,6 +6177,11 @@ msgstr ""
 "(privé bericht)"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "rd"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6222,6 +6239,11 @@ msgid "restricted to known authors"
 msgstr "Beperkt tot bekende auteurs"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "verkoop"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
@@ -6246,7 +6268,7 @@ msgstr "dit document"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_activity_assigned
 msgid "to close for"
-msgstr ""
+msgstr "te sluiten voor"
 
 #. module: mail
 #: code:addons/mail/models/mail_thread.py:1074
diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po
index 6b71fb77e31..59c81ad55a2 100644
--- a/addons/mail/i18n/pl.po
+++ b/addons/mail/i18n/pl.po
@@ -28,10 +28,10 @@
 # Zdzisław Krajewski <zdzichucb@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Zdzisław Krajewski <zdzichucb@gmail.com>, 2018\n"
 "Language-Team: Polish (https://www.transifex.com/odoo/teams/41243/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -155,21 +155,7 @@ msgid "0 Today"
 msgstr "0 Dzisiaj"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -180,7 +166,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -189,7 +175,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -199,8 +185,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -747,7 +733,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2324,8 +2310,9 @@ msgid "Guidelines"
 msgstr "Wytyczne"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2372,6 +2359,7 @@ msgstr "Nagłówki"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2614,7 +2602,8 @@ msgstr ""
 "'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2868,7 +2857,7 @@ msgstr "Urlop"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2888,7 +2877,7 @@ msgstr ""
 "Lista partnerów, którzy zostaną dodani jako obserwujący aktualny dokument."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
@@ -4182,6 +4171,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4837,7 +4831,7 @@ msgid "Show all records which has next action date is before today"
 msgstr "Pokaż wszystkie rekordy, które mają następną akcję przed dzisiaj"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr ""
@@ -5553,7 +5547,7 @@ msgid "Users"
 msgstr "Użytkownicy"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5702,7 +5696,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr "Dodałeś(aś) <b>%s</b> do konwersacji."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr ""
@@ -5736,13 +5730,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "Jesteś w prywatnej konwersacji z <b>@%s</b>."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Jesteś na kanale <b>#%s</b>."
@@ -5907,6 +5901,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5922,6 +5921,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "utworzone"
@@ -6074,6 +6078,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6129,6 +6138,11 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po
index 829daf1e303..dece113dbac 100644
--- a/addons/mail/i18n/pt_BR.po
+++ b/addons/mail/i18n/pt_BR.po
@@ -19,13 +19,14 @@
 # André Augusto Firmino Cordeiro <a.cordeito@gmail.com>, 2018
 # Luciano Giacomazzi <lucianogiacomazzi@gmail.com>, 2018
 # Raphael Rodrigues <raphael0608@gmail.com>, 2018
+# Yannick Belot <yannickbh@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
-"Last-Translator: Raphael Rodrigues <raphael0608@gmail.com>, 2018\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
+"Last-Translator: Yannick Belot <yannickbh@gmail.com>, 2018\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"
@@ -34,7 +35,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -147,21 +148,7 @@ msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -172,7 +159,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -181,7 +168,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -191,8 +178,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -743,7 +730,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -1795,7 +1782,7 @@ msgstr "Data de Vencimento"
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_date_deadline_range
 msgid "Due Date In"
-msgstr ""
+msgstr "Vencimento em"
 
 #. module: mail
 #. openerp-web
@@ -1807,7 +1794,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_date_deadline_range_type
 msgid "Due type"
-msgstr ""
+msgstr "Tipo de vencimento"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_template_form
@@ -2327,8 +2314,9 @@ msgid "Guidelines"
 msgstr "orientações"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2375,6 +2363,7 @@ msgstr "Cabeçalhos"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2619,7 +2608,8 @@ msgstr ""
 "python como \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2875,7 +2865,7 @@ msgstr "Sair"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2895,7 +2885,7 @@ msgid ""
 msgstr "Lista de pessoas que foram incluídas como seguidores deste documento"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
@@ -4197,6 +4187,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4855,7 +4850,7 @@ 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:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr ""
@@ -5574,7 +5569,7 @@ msgid "Users"
 msgstr "Usuários"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5729,7 +5724,7 @@ 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:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr ""
@@ -5763,13 +5758,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr ""
@@ -5934,6 +5929,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "painel de reuniões"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5949,6 +5949,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr ""
@@ -6099,6 +6104,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "rd"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6154,6 +6164,11 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "vendas"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po
index 269f571d98b..8262b645edd 100644
--- a/addons/mail/i18n/ro.po
+++ b/addons/mail/i18n/ro.po
@@ -8,10 +8,10 @@
 # Cozmin Candea <office@terrabit.ro>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Cozmin Candea <office@terrabit.ro>, 2018\n"
 "Language-Team: Romanian (https://www.transifex.com/odoo/teams/41243/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -136,21 +136,7 @@ msgid "0 Today"
 msgstr "0 Astăzi"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -161,7 +147,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -170,7 +156,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -180,8 +166,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -732,7 +718,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2303,8 +2289,9 @@ msgid "Guidelines"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2351,6 +2338,7 @@ msgstr "Antete"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2589,7 +2577,8 @@ msgstr ""
 "python, de exemplu   \"{'camp': 'valoare'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2843,7 +2832,7 @@ msgstr "Părăsește"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2862,7 +2851,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
@@ -4156,6 +4145,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4806,7 +4800,7 @@ msgstr ""
 "Afișați toate înregistrările care au data următoarei acțiuni în trecut"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr ""
@@ -5513,7 +5507,7 @@ msgid "Users"
 msgstr "Utilizatori"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5666,7 +5660,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Sunteți singur în acest canal."
@@ -5700,13 +5694,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr ""
@@ -5868,6 +5862,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "board-meetings"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5883,6 +5882,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "creat"
@@ -6035,6 +6039,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6090,6 +6099,11 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "vânzări"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po
index 11591390816..5c652f5dc11 100644
--- a/addons/mail/i18n/ru.po
+++ b/addons/mail/i18n/ru.po
@@ -7,13 +7,14 @@
 # Collex100, 2018
 # Владимир Куряев <istercul@gmail.com>, 2018
 # Sergey Vilizhanin, 2018
+# Gennady Marchenko <gennadym@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
-"Last-Translator: Sergey Vilizhanin, 2018\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
+"Last-Translator: Gennady Marchenko <gennadym@gmail.com>, 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"
@@ -22,7 +23,7 @@ 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
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr "Это личный канал. Присоединиться к нему могут только приглашённые."
@@ -135,21 +136,7 @@ msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -160,7 +147,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -169,7 +156,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -179,8 +166,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -739,7 +726,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2329,8 +2316,9 @@ msgid "Guidelines"
 msgstr "Руководство"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2377,6 +2365,7 @@ msgstr "Заголовки"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2626,7 +2615,8 @@ msgstr ""
 " \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2882,7 +2872,7 @@ msgstr "Отгул"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2904,7 +2894,7 @@ msgstr ""
 "Список партнеров, которые будут добавлены в подписчики текущего документа."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr "Показать всех подписчиков канала"
@@ -4209,6 +4199,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4868,7 +4863,7 @@ msgid "Show all records which has next action date is before today"
 msgstr "Показать все записи с просроченой датой следующего действия"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "Показать краткую справку"
@@ -5583,7 +5578,7 @@ msgid "Users"
 msgstr "Пользователи"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Пользователи в этом канале: %s %s и вы."
@@ -5738,7 +5733,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr "Вы добавили <b>%s</b> в обсуждение."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Вы единственный человек в этом канале"
@@ -5772,13 +5767,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, 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:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Вы находитесь в канале <b>#%s</b>."
@@ -5944,6 +5939,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "застолье"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5959,6 +5959,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "создано"
@@ -6114,6 +6119,11 @@ msgstr ""
 "публикация сообщения без модели должна быть с parent_id (личное сообщение)"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "rd"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6171,6 +6181,11 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "продажи"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/sk.po b/addons/mail/i18n/sk.po
index d557353bd2b..bd9af3f429f 100644
--- a/addons/mail/i18n/sk.po
+++ b/addons/mail/i18n/sk.po
@@ -2,234 +2,154 @@
 # This file contains the translation of the following modules:
 # * mail
 # 
-# Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
-"PO-Revision-Date: 2017-11-30 13:11+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Language-Team: Slovak (https://www.transifex.com/odoo/teams/41243/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 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:921
 #, 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/mail_manager.js:945
 #, python-format
 msgid "%d Messages"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:32
+#: code:addons/mail/static/src/js/activity.js:89
 #, python-format
 msgid "%d days overdue"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:248
+#: code:addons/mail/models/mail_template.py:249
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:236
+#. openerp-web
+#: code:addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js:133
+#, python-format
+msgid "%s and %s are typing..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:278
 #, python-format
 msgid "%s created"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:77
+#. openerp-web
+#: code:addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js:131
 #, python-format
-msgid "%s has joined the %s network."
+msgid "%s is typing..."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:211
+#: code:addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js:137
 #, python-format
-msgid "&nbsp;("
+msgid "%s, %s and more are typing..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_activity.py:341
+#, python-format
+msgid "%s: %s assigned to you"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
+msgid "&amp;nbsp;"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:179
+#: code:addons/mail/static/src/xml/discuss.xml:285
 #, python-format
-msgid "(from"
+msgid "&nbsp;("
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_shortcode_type
-msgid ""
-"* Smiley are only used for HTML code to display an image * Text (default "
-"value) is used to substitute text with another text"
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:326
+#, python-format
+msgid "(from"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:49
+#: code:addons/mail/static/src/xml/activity.xml:56
 #, python-format
 msgid ", due on"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:331
+#: code:addons/mail/static/src/xml/thread.xml:547
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:78
+#: code:addons/mail/static/src/xml/systray.xml:99
 #, python-format
 msgid "0 Future"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:74
+#: code:addons/mail/static/src/xml/systray.xml:95
 #, python-format
 msgid "0 Late"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:76
+#: code:addons/mail/static/src/xml/systray.xml:97
 #, python-format
 msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
-"            You can mention someone by typing <b>@username</b>, this will grab its attention.<br>\n"
-"            You can mention a channel by typing <b>#channel</b>.<br>\n"
-"            You can execute a command by typing <b>/command</b>.<br>\n"
-"            You can insert canned responses in your message by typing <b>:shortcut</b>.<br>"
+"            Type <b>@username</b> to mention someone, and grab his attention.<br>\n"
+"            Type <b>#channel</b>.to mention a channel.<br>\n"
+"            Type <b>/command</b> to execute a command.<br>\n"
+"            Type <b>:shortcut</b> to insert canned responses in your message.<br>"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:721
+#, 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:584
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -237,8 +157,8 @@ msgid ""
 msgstr ""
 
 #. 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:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -246,7 +166,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:182
+#: code:addons/mail/models/mail_channel.py:294
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">left <a href=\"#\" "
@@ -298,6 +218,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/models/threads/create_mode_document_thread.js:65
+#, python-format
+msgid "<p>Creating a new record...</p>"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid ""
 "<span attrs=\"{'invisible': [('composition_mode', '!=', 'mass_mail')]}\">\n"
@@ -305,7 +232,7 @@ msgid ""
 "                                <span attrs=\"{'invisible': [('use_active_domain', '=', True)]}\">the selected records</span>\n"
 "                                <span attrs=\"{'invisible': [('use_active_domain', '=', False)]}\">the current search filter</span>.\n"
 "                            </span>\n"
-"                            <span attrs=\"{'invisible':['|', ('model', '=', False), ('composition_mode', '=', 'mass_mail')]}\">Followers of the document and</span>"
+"                            <span name=\"document_followers_text\" attrs=\"{'invisible':['|', ('model', '=', False), ('composition_mode', '=', 'mass_mail')]}\">Followers of the document and</span>"
 msgstr ""
 
 #. module: mail
@@ -320,6 +247,18 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid ""
+"<span class=\"fa fa-info-circle\"/> Caution: It won't be possible to send "
+"this mail again to the recipients you did not select."
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Activities</span>"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_template_form
 msgid ""
 "<span class=\"o_stat_text\">Add</span>\n"
@@ -350,6 +289,13 @@ msgid "<strong> Feedback</strong>"
 msgstr ""
 
 #. module: mail
+#: model_terms: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_terms: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"
@@ -362,16 +308,21 @@ 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_test_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."
 msgstr ""
 
 #. module: mail
+#: code:addons/mail/models/ir_actions.py:69
+#, python-format
+msgid "A next activity can only be planned on models that use the chatter"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.actions.act_window,help:mail.mail_shortcode_action
 msgid ""
 "A shortcode is a keyboard shortcut. For instance, you type #gm and it will "
@@ -379,116 +330,81 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:185
+#: code:addons/mail/static/src/xml/thread.xml:412
+#, python-format
+msgid "Accept"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:185
+#, python-format
+msgid "Accept selected messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:412
+#, python-format
+msgid "Accept |"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,moderation_status:0
+#: selection:mail.message,moderation_status:0
+msgid "Accepted"
+msgstr ""
+
+#. module: mail
 #: model:ir.model,name:mail.model_res_groups
 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_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_mail_blacklist__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
 msgid "Action Needed"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__state
+msgid "Action To Do"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_ir_actions_act_window_view
+msgid "Action Window View"
+msgstr ""
+
+#. module: mail
+#: 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.model.fields,field_description:mail.field_mail_blacklist__active
 #: model_terms: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
 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_mail_activity_mixin_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_ids
-#: model:ir.model.fields,field_description:mail.field_note_note_activity_ids
-#: model:ir.model.fields,field_description:mail.field_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
+#: code:addons/mail/static/src/xml/systray.xml:108
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_search
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
-#: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
 #: model:mail.message.subtype,name:mail.mt_activities
 #, python-format
 msgid "Activities"
@@ -496,12 +412,18 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:60
+#: code:addons/mail/static/src/js/views/activity/activity_view.js:15
+#: code:addons/mail/static/src/xml/chatter.xml:93
+#: code:addons/mail/static/src/xml/systray.xml:74
+#: selection:ir.actions.act_window.view,view_mode:0
 #: 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_ir_actions_server__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_type_id
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_calendar
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model_terms:ir.ui.view,arch_db:mail.view_server_action_form_template
+#: selection:ir.ui.view,type:0
 #, python-format
 msgid "Activity"
 msgstr ""
@@ -512,6 +434,12 @@ msgid "Activity Mixin"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: mail
 #: model:ir.model,name:mail.model_mail_activity_type
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
 msgid "Activity Type"
@@ -525,6 +453,11 @@ msgid "Activity Types"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_user_type
+msgid "Activity User Type"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:37
 #, python-format
@@ -533,56 +466,87 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:87
+#: code:addons/mail/static/src/xml/discuss.xml:111
 #, python-format
 msgid "Add"
 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
+#: code:addons/mail/static/src/xml/followers.xml:63
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__channel_ids
 #, python-format
 msgid "Add Channels"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_form
+msgid "Add Email Blacklist"
+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
+#: code:addons/mail/static/src/xml/followers.xml:62
+#: selection:ir.actions.server,state:0
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
 #: model_terms:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
 msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/ir_actions.py:36
+#: code:addons/mail/models/ir_actions.py:63
 #, python-format
 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_mail_compose_message__add_sign
+#: model:ir.model.fields,field_description:mail.field_mail_mail__add_sign
+#: model:ir.model.fields,field_description:mail.field_mail_message__add_sign
+msgid "Add Sign"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
+#: model:ir.model.fields,field_description:mail.field_mail_template__user_signature
 msgid "Add Signature"
 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:52
+#: code:addons/mail/static/src/xml/discuss.xml:242
 #, python-format
 msgid "Add a channel"
 msgstr ""
 
 #. module: mail
+#: code:addons/mail/models/mail_thread.py:383
+#, 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:71
 #, python-format
 msgid "Add a private channel"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.actions.act_window,help:mail.mail_blacklist_action
+msgid "Add an email address in the blacklist"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/composer.xml:15
+#, python-format
+msgid "Add attachment"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 msgid "Add channels to notify..."
 msgstr ""
@@ -594,7 +558,14 @@ msgid "Add contacts to notify..."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_partner_ids
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:418
+#, python-format
+msgid "Add this email address to white list of people"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
 msgid "Additional Contacts"
 msgstr ""
 
@@ -609,50 +580,62 @@ 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_mail_test_alias_id
-#: model:ir.model.fields,field_description:mail.field_res_users_alias_id
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__delay_count
+msgid "After"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/followers.xml:26
+#, python-format
+msgid "Alarm menu"
+msgstr ""
+
+#. module: mail
+#: selection:mail.activity.type,decoration_type:0
+msgid "Alert"
+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_terms:ir.ui.view,arch_db:mail.view_mail_alias_form
 #: model_terms: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_mail_test_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_test_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_test_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_test_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 ""
 
@@ -664,74 +647,144 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:17
-#: code:addons/mail/static/src/xml/systray.xml:28
+#: code:addons/mail/static/src/xml/systray.xml:20
+#: code:addons/mail/static/src/xml/systray.xml:31
 #, python-format
 msgid "All"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:46
+#, python-format
+msgid "All pages:&nbsp;"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Allowed Emails"
+msgstr ""
+
+#. module: mail
 #: selection:ir.model.fields,track_visibility:0
 msgid "Always"
 msgstr ""
 
 #. module: mail
+#: selection:mail.moderation,status:0
+msgid "Always Allow"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:418
+#, python-format
+msgid "Always Allow |"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/models/mail_failure.js:80
+#, python-format
+msgid "An error occured when sending an email"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:198
+#: code:addons/mail/models/mail_channel.py:925
+#: code:addons/mail/static/src/js/models/messages/message.js:148
 #, 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
 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 ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:333
+#: code:addons/mail/static/src/js/followers.js:357
 #, python-format
 msgid "Apply"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_search
+msgid "Archived"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_resend_message.py:122
+#, python-format
+msgid ""
+"Are you sure you want to discard %s mail delivery failures. You won't be "
+"able to re-send these mails later!"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:45
-#: model:ir.model.fields,field_description:mail.field_mail_activity_user_id
+#: code:addons/mail/static/src/xml/activity.xml:52
+#: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
 #, python-format
 msgid "Assigned to"
 msgstr ""
 
 #. module: mail
+#: code:addons/mail/models/mail_activity.py:258
+#: code:addons/mail/models/mail_activity.py:265
+#, python-format
+msgid ""
+"Assigned user %s has no access to the document and is not able to handle "
+"this activity."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 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,name:mail.model_ir_attachment
+msgid "Attachment"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_attachment_count
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_attachment_count
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_attachment_count
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:11
+#: 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_terms:ir.ui.view,arch_db:mail.view_mail_form
+#, python-format
 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."
@@ -748,10 +801,9 @@ 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_terms:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Author"
 msgstr ""
@@ -762,37 +814,46 @@ 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
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that"
 " did not match any partner."
 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
 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_activity__force_next
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__force_next
+msgid "Auto Schedule Next Activity"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Auto Subscribe Groups"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__group_ids
 msgid "Auto Subscription"
 msgstr ""
 
@@ -802,51 +863,121 @@ msgid "Auto subscription"
 msgstr ""
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
-msgid "Available for mass mailing"
+#: model:ir.model.fields,field_description:mail.field_mail_activity__automated
+msgid "Automated activity"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_ir_autovacuum
+msgid "Automatic Vacuum"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_notify
+msgid "Automatic notification"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/followers.xml:44
+#, python-format
+msgid "Avatar"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:420
+#, python-format
+msgid "Ban"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Ban List"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:420
+#, python-format
+msgid "Ban this email address"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Banned Emails"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:89
+#: code:addons/mail/static/src/xml/followers.xml:90
 #, python-format
 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_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
+msgid "Best regards,"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.mail_blacklist_action
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist_mixin__is_blacklisted
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_blacklisted
+#: model:ir.model.fields,field_description:mail.field_res_partner__is_blacklisted
+msgid "Blacklist"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_tree
+msgid "Blacklist Date"
+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_terms:ir.ui.view,arch_db:mail.view_mail_form
 #: model_terms: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
 msgid "Bounce"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:398
 #: selection:mail.notification,email_status:0
+#, python-format
 msgid "Bounced"
 msgstr ""
 
 #. module: mail
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Calendar"
+msgstr ""
+
+#. module: mail
 #: model:mail.activity.type,name:mail.mail_activity_data_call
 msgid "Call"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:341
-#: code:addons/mail/static/src/xml/activity.xml:65
+#: code:addons/mail/static/src/js/followers.js:365
+#: code:addons/mail/static/src/xml/activity.xml:86
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
 #: model_terms:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Cancel"
-msgstr "Zrušiť"
+msgstr ""
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_tree
@@ -854,13 +985,21 @@ msgid "Cancel Email"
 msgstr ""
 
 #. module: mail
-#: selection:mail.mail,state:0
-msgid "Cancelled"
-msgstr "Zrušené"
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid "Cancel notification in failure"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:401
+#: selection:mail.notification,email_status:0
+#, python-format
+msgid "Canceled"
+msgstr ""
 
 #. module: mail
-#: selection:mail.shortcode,shortcode_type:0
-msgid "Canned Response"
+#: selection:mail.mail,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: mail
@@ -869,32 +1008,37 @@ 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,field_description:mail.field_res_company__catchall
+msgid "Catchall Email"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_category
+#: model:ir.model.fields,help:mail.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
 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 ""
 
@@ -904,40 +1048,73 @@ msgid "Change"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_decoration
+#: model:ir.model.fields,help:mail.field_mail_activity_type__decoration_type
+msgid "Change the background color of the related activities of this type."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:443
+#, python-format
+msgid "Changed"
+msgstr ""
+
+#. module: mail
+#: 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
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:108
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__channel_id
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_kanban
 #: selection:mail.channel,channel_type:0
+#, python-format
 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.ui.menu,name:mail.mail_moderation_menu
+msgid "Channel Moderation"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_type
 msgid "Channel Type"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_mail_moderation
+msgid "Channel black/white list"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:36
-#: code:addons/mail/static/src/xml/client_action.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
+#: code:addons/mail/static/src/xml/discuss.xml:144
+#, python-format
+msgid "Channel settings"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:47
+#: code:addons/mail/static/src/xml/discuss.xml:224
+#: code:addons/mail/static/src/xml/systray.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:39
+#: 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.ui.menu,name:mail.mail_channel_menu_settings
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
 #, python-format
@@ -952,10 +1129,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.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
+#: code:addons/mail/static/src/xml/discuss.xml:220
+#: code:addons/mail/static/src/xml/systray.xml:21
+#: code:addons/mail/static/src/xml/systray.xml:35
 #, python-format
 msgid "Chat"
 msgstr ""
@@ -971,10 +1147,9 @@ 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
 msgid "Child Messages"
 msgstr ""
 
@@ -984,20 +1159,17 @@ msgid "Choose an example"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:342
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:50
 #, python-format
-msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
+msgid "Close"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:358
+#. openerp-web
+#: code:addons/mail/static/src/xml/abstract_thread_window.xml:67
 #, python-format
-msgid "Click here to add new %s"
-msgstr ""
-
-#. module: mail
-#: model_terms:ir.actions.act_window,help:mail.mail_shortcode_action
-msgid "Click to define a new chat shortcode."
+msgid "Close chat window"
 msgstr ""
 
 #. module: mail
@@ -1016,8 +1188,8 @@ msgid "Comma-separated ids of recipient partners"
 msgstr ""
 
 #. 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 ""
@@ -1028,8 +1200,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 ""
 
@@ -1037,42 +1209,58 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_search
 #: selection:mail.compose.message,message_type:0
 #: selection:mail.message,message_type:0
-#: selection:survey.mail.compose.message,message_type:0
 msgid "Comment"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/activity.js:378
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#, python-format
 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
 msgid "Composition mode"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
 msgid "Configure your activity types"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:109
+#: code:addons/mail/static/src/xml/thread.xml:130
 #, 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:944
 #, python-format
 msgid "Congratulations, your inbox is empty!"
 msgstr ""
 
 #. module: mail
+#: selection:mail.notification,failure_type:0
+msgid "Connection failed (outgoing mail server problem)"
+msgstr ""
+
+#. module: mail
 #: model:ir.model,name:mail.model_res_partner
 msgid "Contact"
 msgstr ""
@@ -1084,46 +1272,61 @@ 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
 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 ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
+#: code:addons/mail/static/src/xml/systray.xml:9
 #, python-format
 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
 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:565
 #, python-format
 msgid "Create %s"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
-msgid "Create Date"
+#: selection:ir.actions.server,state:0
+msgid "Create Next Activity"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:400
+#, python-format
+msgid "Create a new %(document)s"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:392
+#, python-format
+msgid "Create a new %(document)s by sending an email to %(email_link)s"
+msgstr ""
+
+#. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Create a new Record"
 msgstr ""
 
 #. module: mail
@@ -1132,136 +1335,104 @@ 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_test_create_uid
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_blacklist__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_moderation__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_uid
 msgid "Created by"
-msgstr "Vytvoril"
+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_test_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_blacklist__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__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_moderation__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__create_date
 #, python-format
 msgid "Created on"
-msgstr "Vytvorené"
+msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_form
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_search
-msgid "Creation Month"
+msgid "Creation Date"
 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,field_description:mail.field_mail_activity__create_user_id
+msgid "Creator"
+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
 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,help:mail.field_mail_channel__is_moderator
+msgid "Current user is a moderator of the channel"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
+#: model:ir.model.fields,field_description:mail.field_mail_mail__date
+#: model:ir.model.fields,field_description:mail.field_mail_message__date
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
 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_message_last_post
-#: model:ir.model.fields,help:mail.field_mail_test_simple_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
-msgid "Date of the last message posted on the record."
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:93
+#, python-format
+msgid "Dates"
+msgstr ""
+
+#. module: mail
+#: selection:ir.actions.server,activity_date_deadline_range_type:0
+msgid "Days"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:46
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
+#, python-format
 msgid "Deadline"
 msgstr ""
 
@@ -1271,33 +1442,43 @@ 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_activity__activity_decoration
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__decoration_type
+msgid "Decoration Type"
+msgstr ""
+
+#. module: mail
+#: 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_mail_activity_type__default_next_type_id
+msgid "Default Next Activity"
+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
 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_test_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"
@@ -1305,28 +1486,41 @@ msgid ""
 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"
+#: model_terms: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_message
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete_message
-msgid "Delete Message Copy"
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__delay_from
+msgid "Delay Type"
 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
-msgid "Delete sent emails (mass mailing only)"
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__delay_unit
+msgid "Delay units"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:320
+#: code:addons/mail/static/src/xml/composer.xml:87
+#: code:addons/mail/static/src/xml/thread.xml:532
 #, python-format
-msgid "Delete this attachment"
+msgid "Delete"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_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
+msgid "Delete Message Copy"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete
+msgid "Delete sent emails (mass mailing only)"
 msgstr ""
 
 #. module: mail
@@ -1335,32 +1529,37 @@ 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_test_description
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_terms:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
 msgid "Description"
-msgstr "Popis"
+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."
 msgstr ""
 
 #. module: mail
+#: selection:ir.ui.view,type:0
+msgid "Diagram"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:46
+#: code:addons/mail/static/src/xml/discuss.xml:57
 #, python-format
 msgid "Direct Messages"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:81
+#: code:addons/mail/static/src/js/discuss.js:348
+#: code:addons/mail/static/src/xml/activity.xml:103
+#: code:addons/mail/static/src/xml/discuss.xml:187
 #: model_terms:ir.ui.view,arch_db:mail.email_template_preview_form
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
 #, python-format
@@ -1368,7 +1567,32 @@ msgid "Discard"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.mail_channel_menu_root_chat
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid "Discard delivery failures"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.mail_resend_cancel_action
+msgid "Discard mail delivery failures"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:187
+#, python-format
+msgid "Discard selected messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:416
+#, python-format
+msgid "Discard |"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_discuss
+#: model:ir.ui.menu,name:mail.menu_root_discuss
 #: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
 msgid "Discuss"
 msgstr ""
@@ -1384,30 +1608,39 @@ 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_test_display_name
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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,name:mail.model_mail_resend_cancel
+msgid "Dismiss notification for resend by model"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_email_template_preview__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_activity__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__display_name
+#: 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_blacklist__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist_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_moderation__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_notification__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_template__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_thread__display_name
+#: 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 "Zobraziť meno"
+msgstr ""
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_template_form
@@ -1417,107 +1650,146 @@ 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
 msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.view_document_file_kanban
+msgid "Document"
+msgstr ""
+
+#. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 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 ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:79
+#: code:addons/mail/static/src/xml/activity.xml:101
 #, python-format
 msgid "Done"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:77
+#: code:addons/mail/static/src/xml/activity.xml:107
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#, python-format
+msgid "Done & Launch Next"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:99
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
 #, python-format
 msgid "Done & Schedule Next"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:296
+#: code:addons/mail/static/src/xml/thread.xml:43
+#: code:addons/mail/static/src/xml/thread.xml:77
 #, python-format
-msgid "Download this PDF"
+msgid "Download"
 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/followers.xml:11
 #, python-format
-msgid "Download this attachment"
+msgid "Dropdown menu - Followers"
 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
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_date_deadline_range
+msgid "Due Date In"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:38
+#: code:addons/mail/static/src/js/activity.js:95
 #, python-format
 msgid "Due in %d days"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_date_deadline_range_type
+msgid "Due type"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_template_form
 msgid "Dynamic Placeholder Generator"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:62
+#: code:addons/mail/static/src/xml/activity.xml:83
 #, python-format
 msgid "Edit"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid "Edit Partners"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:330
+#: code:addons/mail/static/src/js/followers.js:354
 #, python-format
 msgid "Edit Subscription of "
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:49
+#: code:addons/mail/static/src/xml/followers.xml:50
 #, python-format
 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.model.fields,field_description:mail.field_mail_moderation__email
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__email
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_search
 #: model:mail.activity.type,name:mail.mail_activity_data_email
 #: selection:mail.compose.message,message_type:0
 #: selection:mail.message,message_type:0
-#: selection:survey.mail.compose.message,message_type:0
 msgid "Email"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__email
+msgid "Email Address"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Email Alias"
 msgstr ""
@@ -1528,13 +1800,18 @@ msgid "Email Aliases"
 msgstr ""
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.email_template_form
-msgid "Email Configuration"
+#: model:ir.model,name:mail.model_mail_alias_mixin
+msgid "Email Aliases Mixin"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_tree
+msgid "Email Blacklist"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_email_from
-msgid "Email From"
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
+msgid "Email Configuration"
 msgstr ""
 
 #. module: mail
@@ -1548,12 +1825,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 ""
 
@@ -1573,31 +1850,47 @@ msgid "Email Thread"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_res_users_alias_id
+#: sql_constraint:mail.blacklist:0
+msgid "Email address already exists!"
+msgstr ""
+
+#. module: mail
+#: 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
 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."
 msgstr ""
 
 #. module: mail
+#: selection:mail.notification,failure_type:0
+msgid "Email address rejected by destination"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 msgid "Email address to redirect replies..."
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.actions.act_window,help:mail.mail_blacklist_action
+msgid ""
+"Email addresses that are blacklisted means that the recipient won't receive "
+"any mass mailing anymore."
+msgstr ""
+
+#. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr "Sprievodca zostavovaním emailov"
+msgstr ""
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -1606,6 +1899,11 @@ msgid "Email message"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_mail_resend_message
+msgid "Email resend wizard"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_mail
 #: model:ir.ui.menu,name:mail.menu_mail_mail
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_tree
@@ -1613,13 +1911,33 @@ msgid "Emails"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/update.py:97
+#. openerp-web
+#: code:addons/mail/static/src/xml/composer.xml:14
+#, python-format
+msgid "Emojis"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid "Envelope Example"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:399
+#: selection:mail.activity.type,decoration_type:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/update.py:98
 #, python-format
 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:317
 #, python-format
 msgid ""
 "Error without exception. Probably due do sending an email without computed "
@@ -1648,17 +1966,35 @@ msgid "Everyone"
 msgstr ""
 
 #. module: mail
+#: model:mail.activity.type,name:mail.mail_activity_data_warning
 #: selection:mail.notification,email_status:0
 msgid "Exception"
 msgstr ""
 
 #. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Execute Python Code"
+msgstr ""
+
+#. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Execute several actions"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_config_settings_fail_counter
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:45
+#, python-format
+msgid "Extract pages:&nbsp;"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_config_settings__fail_counter
 msgid "Fail Mail"
 msgstr ""
 
@@ -1668,64 +2004,73 @@ msgid "Failed"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:374
+#: code:addons/mail/models/mail_template.py:338
 #, 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_terms: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,field_description:mail.field_mail_notification__failure_reason
+msgid "Failure reason"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
 msgid ""
 "Failure reason. This is usually the exception thrown by the email server, "
 "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_notification__failure_type
+msgid "Failure type"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__starred_partner_ids
 msgid "Favorited By"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:209
-#: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
+#: code:addons/mail/static/src/js/activity.js:316
+#: 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 "
@@ -1738,8 +2083,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."
@@ -1752,7 +2097,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"
@@ -1760,196 +2104,28 @@ 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_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_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_mail_blacklist__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_thread__message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: model_terms: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_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_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_mail_blacklist__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_thread__message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__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_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_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_mail_blacklist__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_thread__message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
 msgid "Followers (Partners)"
 msgstr ""
 
@@ -1960,7 +2136,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:15
+#: code:addons/mail/static/src/xml/chatter.xml:40
 #, python-format
 msgid "Followers of"
 msgstr ""
@@ -1978,24 +2154,36 @@ 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
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Form"
+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
 msgid "From"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:77
+#: code:addons/mail/static/src/xml/chatter.xml:73
+#, python-format
+msgid "Full composer"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/systray.xml:98
 #, python-format
 msgid "Future"
 msgstr ""
@@ -2007,22 +2195,39 @@ msgid "Future Activities"
 msgstr ""
 
 #. module: mail
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Gantt"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_message_form
 msgid "Gateway"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:54
+#: selection:ir.actions.server,activity_user_type:0
+msgid "Generic User From Record"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/res_users.py:88
 #, python-format
 msgid "Go to the configuration panel"
 msgstr ""
 
 #. module: mail
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Graph"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_search
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Group By"
-msgstr "Zoskupiť podľa"
+msgstr ""
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_email_template_search
@@ -2035,6 +2240,17 @@ msgid "Groups"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_guidelines_msg
+msgid "Guidelines"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
+msgstr ""
+
+#. module: mail
 #: selection:res.users,notification_type:0
 msgid "Handle by Emails"
 msgstr ""
@@ -2045,6 +2261,11 @@ msgid "Handle in Odoo"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__has_cancel
+msgid "Has Cancel"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_message_search
 msgid "Has Mentions"
 msgstr ""
@@ -2055,272 +2276,231 @@ 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_compose_message__has_error
+#: model:ir.model.fields,field_description:mail.field_mail_mail__has_error
+#: model:ir.model.fields,field_description:mail.field_mail_message__has_error
+#: model:ir.model.fields,help:mail.field_mail_compose_message__has_error
+#: model:ir.model.fields,help:mail.field_mail_mail__has_error
+#: model:ir.model.fields,help:mail.field_mail_message__has_error
+msgid "Has error"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_mail__headers
 #: model_terms: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_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Hello"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__help_message
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__message
+msgid "Help message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
 msgid "Hidden"
 msgstr ""
 
 #. 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_test_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_blacklist__id
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist_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_moderation__id
+#: model:ir.model.fields,field_description:mail.field_mail_notification__id
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__id
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__id
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__id
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__id
+#: model:ir.model.fields,field_description:mail.field_mail_template__id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__id
+#: 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"
+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_test_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 ""
 
 #. 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:157
+#: code:addons/mail/static/src/xml/discuss.xml:277
 #, 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_message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_simple_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_mail_blacklist__message_unread
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,help:mail.field_res_partner__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_message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_simple_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_mail_blacklist__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
+#: model:ir.model.fields,help:mail.field_res_partner__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_blacklist__message_has_error
+#: model:ir.model.fields,help:mail.field_mail_channel__message_has_error
+#: model:ir.model.fields,help:mail.field_mail_thread__message_has_error
+#: model:ir.model.fields,help:mail.field_res_partner__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
 msgid ""
 "If checked, the partners will receive an email warning they have been added "
 "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_mail_mail__scheduled_date
 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 "
-"users to filter the partners when performing mass mailing."
+"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_mail_mail_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."
+"the email will be send as soon as possible. Jinja2 placeholders may be used."
 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_mail_blacklist_mixin__is_blacklisted
+#: model:ir.model.fields,help:mail.field_mail_channel_partner__is_blacklisted
+#: model:ir.model.fields,help:mail.field_res_partner__is_blacklisted
 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."
+"If the email address is on the blacklist, the contact won't receive mass "
+"mailing anymore, from any list"
 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."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:141
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid ""
+"If you want to re-send them, click Cancel now, then click on the "
+"notification and review them one by one by clicking on the red envelope next"
+" to each message."
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid "Ignore all failures"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:39
+#, python-format
+msgid "Image"
+msgstr ""
+
+#. module: mail
+#: 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/mail_manager.js:1232
+#: code:addons/mail/static/src/xml/discuss.xml:27
+#: code:addons/mail/static/src/xml/discuss.xml:205
+#: code:addons/mail/static/src/xml/discuss.xml:216
 #, 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_activity__automated
+msgid ""
+"Indicates this activity has been created automatically and not by any user."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:33
+#, python-format
+msgid "Info"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__initial_res_model_id
+msgid "Initial model"
+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
 msgid "Initial thread message."
 msgstr ""
 
@@ -2331,12 +2511,17 @@ 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
+#: selection:mail.notification,failure_type:0
+msgid "Invalid email address"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_alias.py:88
 #, python-format
 msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
@@ -2344,7 +2529,15 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1792
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
+#, python-format
+msgid "Invalid primary email field on model %s"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:1968
+#: code:addons/mail/models/mail_thread.py:2199
 #, python-format
 msgid ""
 "Invalid record set: should be called as model (without records) or on "
@@ -2352,14 +2545,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/mail_notification_manager.js:197
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -2372,30 +2565,30 @@ msgstr ""
 
 #. 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:45
+#: code:addons/mail/static/src/xml/discuss.xml:178
 #, python-format
 msgid "Invite"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:170
+#: code:addons/mail/static/src/js/followers.js:171
 #, python-format
 msgid "Invite Follower"
 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:30
+#: code:addons/mail/static/src/xml/discuss.xml:178
 #, 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:1188
 #, python-format
 msgid "Invite people to #%s"
 msgstr ""
@@ -2411,91 +2604,50 @@ 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_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_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_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Is Allowed"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Is Banned"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__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_thread__message_is_follower
+#: model:ir.model.fields,field_description:mail.field_res_partner__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_res_users__is_moderator
+msgid "Is moderator"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
 msgid "Is pinned on the interface"
 msgstr ""
 
@@ -2510,152 +2662,104 @@ 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
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Kanban"
+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
 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_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_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
-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_test___last_update
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple___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_blacklist____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist_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_moderation____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_notification____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_template____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_thread____last_update
+#: 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 "Posledná modifikácia"
+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_test_simple_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_test_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_write_uid
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid
+#: 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_blacklist__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_moderation__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_uid
 msgid "Last Updated by"
-msgstr "Naposledy upravoval"
-
-#. 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_test_simple_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_test_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_write_date
-#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date
+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__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_blacklist__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_moderation__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_template__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__write_date
 msgid "Last Updated on"
-msgstr "Naposledy upravované"
+msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:73
+#: code:addons/mail/static/src/xml/systray.xml:94
 #, python-format
 msgid "Late"
 msgstr ""
@@ -2667,43 +2771,50 @@ msgid "Late Activities"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__layout
+#: model:ir.model.fields,field_description:mail.field_mail_mail__layout
+#: model:ir.model.fields,field_description:mail.field_mail_message__layout
+msgid "Layout"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_kanban
 msgid "Leave"
 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:935
+#: code:addons/mail/static/src/xml/discuss.xml:147
 #, 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:946
 #, 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 ""
 
@@ -2719,7 +2830,29 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:31
+#: code:addons/mail/static/src/xml/thread.xml:55
+#, python-format
+msgid "Loading"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:544
+#, python-format
+msgid "Loading older messages..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:15
+#, python-format
+msgid "Loading..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/composers/chatter_composer.js:34
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:41
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Log"
@@ -2727,13 +2860,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:56
+#: code:addons/mail/static/src/xml/chatter.xml:89
 #, python-format
 msgid "Log a note. Followers will not be notified."
 msgstr ""
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model_terms:ir.ui.view,arch_db:mail.view_server_action_form_template
 msgid "Log a note..."
 msgstr ""
 
@@ -2743,46 +2877,70 @@ 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
 msgid "Log an Internal Note"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:56
+#: code:addons/mail/static/src/xml/chatter.xml:89
 #, python-format
 msgid "Log note"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:59
+#: code:addons/mail/static/src/xml/chatter.xml:92
 #, python-format
 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
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:68
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:51
+#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_id
+#, python-format
+msgid "Mail"
+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
 msgid "Mail Activity Type"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_mail_blacklist
+msgid "Mail Blacklist"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_blacklist_mixin
+msgid "Mail Blacklist mixin"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:198
+#, python-format
+msgid "Mail Body"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Mail Channel Form"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:369
+#: code:addons/mail/models/mail_mail.py:385
 #, 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_terms:ir.ui.view,arch_db:mail.model_search_view
 msgid "Mail Thread"
 msgstr ""
@@ -2793,7 +2951,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 ""
 
@@ -2805,33 +2963,57 @@ msgid "Mail: Email Queue Manager"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:832
+#: model:ir.actions.server,name:mail.ir_cron_mail_notify_channel_moderators_ir_actions_server
+#: model:ir.cron,cron_name:mail.ir_cron_mail_notify_channel_moderators
+#: model:ir.cron,name:mail.ir_cron_mail_notify_channel_moderators
+msgid "Mail: Notify channel moderators"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:939
 #, python-format
 msgid "Mailbox unavailable - %s"
 msgstr ""
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.res_partner_view_form_inherit_mail
-msgid "Mailing Opt-Out"
+#: model:ir.model.fields,field_description:mail.field_mail_activity__mail_template_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__mail_template_ids
+msgid "Mails templates"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_main_attachment_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_main_attachment_id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_main_attachment_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_main_attachment_id
+msgid "Main Attachment"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:59
+#: code:addons/mail/static/src/js/tools/debug_manager.js:22
+#: code:addons/mail/static/src/xml/thread.xml:9
+#, python-format
+msgid "Manage Messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:80
 #, python-format
 msgid "Mark Done"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:179
 #, 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:179
 #, python-format
 msgid "Mark all read"
 msgstr ""
@@ -2843,33 +3025,39 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:206
+#: code:addons/mail/static/src/xml/discuss.xml:298
+#: code:addons/mail/static/src/xml/thread.xml:346
 #, 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:299
+#: code:addons/mail/static/src/xml/thread.xml:340
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:49
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:71
 #, python-format
 msgid "Mark as done"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
+#: model:ir.ui.menu,name:mail.mail_blacklist_menu
+msgid "Mass Mail Blacklist"
+msgstr ""
+
+#. module: mail
+#: 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 "
@@ -2888,23 +3076,43 @@ 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
+#: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
+msgid "Merge Partner Wizard"
+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_resend_message__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
 #: model_terms: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_blacklist__message_has_error
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_has_error
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_has_error
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
 msgid "Message ID"
 msgstr ""
 
@@ -2914,37 +3122,42 @@ 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
 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
+#: code:addons/mail/models/mail_message.py:1277
+#, python-format
+msgid "Message are pending moderation"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_mail__email_to
 msgid "Message recipients (emails)"
 msgstr ""
 
 #. 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:165
 #, 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"
@@ -2959,100 +3172,41 @@ 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
 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
 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
 msgid "Message-Id"
 msgstr ""
 
 #. 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_message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_mail_blacklist__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
 #: model:ir.ui.menu,name:mail.menu_mail_message
 #: model_terms:ir.ui.view,arch_db:mail.view_message_tree
 msgid "Messages"
@@ -3071,27 +3225,40 @@ 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"
 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
+#. openerp-web
+#: code:addons/mail/static/src/js/models/threads/mailbox.js:202
+#, python-format
+msgid "Missing domain for mailbox with ID '%s'"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__res_model_id
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__res_model
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__model
 #: model_terms:ir.ui.view,arch_db:mail.view_email_template_search
 #: model_terms: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,field_description:mail.field_mail_activity_type__res_model_change
+msgid "Model has change"
+msgstr ""
+
+#. module: mail
+#: 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 ""
@@ -3102,13 +3269,95 @@ msgid "Models"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/services/mail_manager.js:1244
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#, python-format
+msgid "Moderate Messages"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation
+msgid "Moderate this channel"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__moderator_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__moderator_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__moderator_id
+msgid "Moderated By"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_ids
+msgid "Moderated Emails"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_users__moderation_channel_ids
+msgid "Moderated channels"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_count
+msgid "Moderated emails count"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.mail_moderation_action
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Moderation"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_tree
+msgid "Moderation Lists"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:39
+#, python-format
+msgid "Moderation Queue"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__moderation_status
+#: model:ir.model.fields,field_description:mail.field_mail_mail__moderation_status
+#: model:ir.model.fields,field_description:mail.field_mail_message__moderation_status
+msgid "Moderation Status"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_users__moderation_counter
+msgid "Moderation count"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_moderator
+msgid "Moderator"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderator_ids
+msgid "Moderators"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+msgid ""
+"Modifying the model can have an impact on existing activities using this "
+"activity type, be careful."
+msgstr ""
+
+#. module: mail
 #: model:ir.model,name:mail.model_base_module_uninstall
-msgid "Module Uninstallation"
+msgid "Module Uninstall"
 msgstr ""
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
-msgid "Month"
+#: selection:ir.actions.server,activity_date_deadline_range_type:0
+msgid "Months"
 msgstr ""
 
 #. module: mail
@@ -3118,267 +3367,250 @@ msgid "My Activities"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_name
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_name
-#: model:ir.model.fields,field_description:mail.field_mail_channel_name
-#: model:ir.model.fields,field_description:mail.field_mail_template_name
-#: model:ir.model.fields,field_description:mail.field_mail_test_name
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_resend_partner__name
+#: model:ir.model.fields,field_description:mail.field_mail_template__name
 #: model_terms: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
 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."
 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,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_terms: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_compose_message__need_moderation
+#: model:ir.model.fields,field_description:mail.field_mail_mail__need_moderation
+#: model:ir.model.fields,field_description:mail.field_mail_message__need_moderation
+msgid "Need moderation"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
 msgid "Needaction Recipient"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:138
+#: code:addons/mail/static/src/xml/discuss.xml:182
 #, 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:181
 #, 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/xml/systray.xml:12
-#: code:addons/mail/static/src/xml/systray.xml:21
+#: code:addons/mail/static/src/js/services/mail_manager.js:935
+#: code:addons/mail/static/src/js/thread_windows/thread_window.js:112
+#: code:addons/mail/static/src/xml/systray.xml:15
+#: code:addons/mail/static/src/xml/systray.xml:24
 #, python-format
 msgid "New message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:233
+#: code:addons/mail/static/src/xml/thread.xml:429
 #, 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:131
 #, 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:104
 #, python-format
 msgid "New people"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,help:mail.field_mail_channel__moderation_guidelines
+msgid ""
+"Newcomers on this moderated channel will automatically receive the "
+"guidelines."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:95
+#, python-format
+msgid "Next"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_tree
 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_mail_activity_mixin_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_note_note_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_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_mail_activity_mixin__activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_res_partner__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_mail_activity_mixin_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_summary
-#: model:ir.model.fields,field_description:mail.field_note_note_activity_summary
-#: model:ir.model.fields,field_description:mail.field_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_mail_activity_mixin__activity_summary
+#: model:ir.model.fields,field_description:mail.field_res_partner__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_mail_activity_mixin_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_note_note_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_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_mail_activity_mixin__activity_type_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__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 ""
 
 #. module: mail
+#: code:addons/mail/models/mail_notification.py:50
+#, python-format
+msgid "No Error"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:58
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:68
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:20
 #, python-format
 msgid "No activities planned."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:47
+#: code:addons/mail/static/src/xml/systray.xml:54
 #, python-format
-msgid "No discussion yet..."
+msgid "No conversation yet..."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:185
+#: code:addons/mail/static/src/xml/activity_view.xml:21
+#, python-format
+msgid "No data to display"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/followers.js:186
 #, python-format
 msgid "No follower"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:16
+#: code:addons/mail/static/src/xml/thread.xml:27
 #, python-format
 msgid "No matches found"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:17
+#: code:addons/mail/static/src/js/tools/debug_manager.js:17
+#, python-format
+msgid "No message available"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:28
 #, python-format
 msgid "No message matches your search. Try to change your search filters."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:113
+#: code:addons/mail/static/src/xml/thread.xml:134
 #, 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
 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_ir_actions_server__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:304
 #, python-format
 msgid "Note by"
 msgstr ""
@@ -3389,292 +3621,122 @@ 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_channel__moderation_notify_msg
+msgid "Notification message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail__notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message__notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_resend_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
 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
 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_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_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_mail_blacklist__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_thread__message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__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__delay_count
 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_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_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
-msgid "Number of messages which requires an action"
+"Number of days/week/month 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_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_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple_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
-msgid "Number of unread messages"
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_has_error_counter
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_has_error_counter
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_has_error_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_has_error_counter
+msgid "Number of error"
 msgstr ""
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.message_user_assigned
-msgid "Odoo"
+#: model:ir.model.fields,help:mail.field_mail_blacklist__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
+msgid "Number of messages which requires an action"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:895
-#, python-format
-msgid ""
-"Odoo has now the permission to send you native notifications on this device."
+#: model:ir.model.fields,help:mail.field_mail_blacklist__message_has_error_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_has_error_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_has_error_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_has_error_counter
+msgid "Number of messages with delivery error"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
-#, python-format
-msgid "Odoo needs your permission to"
+#: model:ir.model.fields,help:mail.field_mail_blacklist__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
+#: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
+msgid "Number of unread messages"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:892
-#, python-format
-msgid ""
-"Odoo will not have the permission to send native notifications on this "
-"device."
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_light
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
+#: model_terms:ir.ui.view,arch_db:mail.message_notification_email
+msgid "Odoo"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:120
+#: code:addons/mail/static/src/xml/discuss.xml:158
 #, 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 ""
 
@@ -3694,21 +3756,21 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:187
+#: code:addons/mail/static/src/js/followers.js:188
 #, python-format
 msgid "One follower"
 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:156
+#: code:addons/mail/static/src/xml/discuss.xml:276
 #, 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 ""
@@ -3730,36 +3792,29 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
+#: code:addons/mail/static/src/xml/discuss.xml:243
 #, python-format
-msgid "Open channel settings"
+msgid "Open chat"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:187
+#: code:addons/mail/static/src/js/thread_windows/thread_window.js:190
 #, python-format
-msgid "Open chat"
+msgid "Open document"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/extended_chat_window.xml:15
+#: code:addons/mail/static/src/js/thread_windows/thread_window.js:192
 #, python-format
 msgid "Open in Discuss"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_partner_opt_out
-#: model:ir.model.fields,field_description:mail.field_res_users_opt_out
-msgid "Opt-Out"
-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_test_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 "
@@ -3767,22 +3822,22 @@ msgid ""
 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."
 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 "
@@ -3791,8 +3846,8 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
@@ -3802,13 +3857,14 @@ msgid "Other"
 msgstr ""
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
+#: selection:mail.mail,state:0
 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 ""
 
@@ -3818,31 +3874,16 @@ 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
 msgid "Outgoing mail server"
 msgstr ""
 
 #. module: mail
-#: selection:account.invoice,activity_state:0
-#: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
-#: selection:hr.applicant,activity_state:0 selection:mail.activity,state:0
+#: selection:mail.activity,state:0
 #: selection:mail.activity.mixin,activity_state:0
-#: selection:maintenance.equipment,activity_state:0
-#: selection:maintenance.request,activity_state:0
-#: selection:mrp.production,activity_state:0
-#: selection:mrp.repair,activity_state:0
-#: selection:mrp.unbuild,activity_state:0 selection:note.note,activity_state:0
-#: selection:product.product,activity_state:0
-#: selection:product.template,activity_state:0
-#: selection:project.task,activity_state:0
-#: selection:purchase.order,activity_state:0
 #: selection:res.partner,activity_state:0
-#: selection:sale.order,activity_state:0
-#: selection:stock.picking,activity_state:0
-#: selection:survey.survey,activity_state:0
 msgid "Overdue"
 msgstr ""
 
@@ -3852,47 +3893,49 @@ 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_test_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
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:40
+#, python-format
+msgid "PDF file"
+msgstr ""
+
+#. module: mail
+#: 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
 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_test_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_test_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 ""
 
 #. 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_test_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 "
@@ -3900,7 +3943,7 @@ msgid ""
 msgstr ""
 
 #. 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 "
@@ -3908,79 +3951,93 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_partner_mass_mail
-msgid "Partner Mass Mailing"
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__partner_id
+msgid "Partner"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/res_partner.py:32
+#: code:addons/mail/models/res_partner.py:29
 #, python-format
 msgid "Partner Profile"
 msgstr ""
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
-msgid "Partners that did not ask not to be included in mass mailing campaigns"
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__partner_readonly
+msgid "Partner Readonly"
 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,name:mail.model_mail_resend_partner
+msgid "Partner with additionnal information for mail resend"
+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
 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
-msgid "Permanently delete this email after sending it, to save space"
+#: selection:mail.compose.message,moderation_status:0
+#: selection:mail.message,moderation_status:0
+msgid "Pending Moderation"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:891
+#: code:addons/mail/static/src/xml/thread.xml:424
 #, python-format
-msgid "Permission denied"
+msgid "Pending moderation"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:894
+#: code:addons/mail/static/src/xml/thread.xml:139
 #, python-format
-msgid "Permission granted"
+msgid "Pending moderation messages appear here."
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_channel__moderation_notify
+msgid ""
+"People receive an automatic notification about their message being waiting "
+"for moderation."
+msgstr ""
+
+#. module: mail
+#: selection:mail.moderation,status:0
+msgid "Permanent Ban"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_image
+#: 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
+#: 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
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Pivot"
+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
 msgid "Placeholder Expression"
 msgstr ""
 
 #. module: mail
-#: selection:account.invoice,activity_state:0
-#: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
-#: selection:hr.applicant,activity_state:0 selection:mail.activity,state:0
+#: selection:mail.activity,state:0
 #: selection:mail.activity.mixin,activity_state:0
-#: selection:maintenance.equipment,activity_state:0
-#: selection:maintenance.request,activity_state:0
-#: selection:mrp.production,activity_state:0
-#: selection:mrp.repair,activity_state:0
-#: selection:mrp.unbuild,activity_state:0 selection:note.note,activity_state:0
-#: selection:product.product,activity_state:0
-#: selection:product.template,activity_state:0
-#: selection:project.task,activity_state:0
-#: selection:purchase.order,activity_state:0
 #: selection:res.partner,activity_state:0
-#: selection:sale.order,activity_state:0
-#: selection:stock.picking,activity_state:0
-#: selection:survey.survey,activity_state:0
 msgid "Planned"
 msgstr ""
 
@@ -3992,47 +4049,54 @@ msgid "Planned activities"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:282
-#, python-format
-msgid "Play this video"
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
+msgid "Planned in"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:158
+#: code:addons/mail/static/src/js/composers/chatter_composer.js:123
 #, python-format
 msgid "Please complete customer's informations"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Please contact us instead using"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:84
+#: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
-msgid "Please complete customer's informations and email"
+msgid "Please wait"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:651
+#: code:addons/mail/static/src/js/composers/basic_composer.js:242
 #, 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_mail_test_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"
@@ -4041,12 +4105,14 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.message_user_assigned
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_light
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
 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 ""
 
@@ -4056,13 +4122,18 @@ 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 ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:70
+#: code:addons/mail/static/src/xml/discuss.xml:275
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:54
 #: model_terms:ir.ui.view,arch_db:mail.email_template_form
+#, python-format
 msgid "Preview"
 msgstr ""
 
@@ -4072,32 +4143,51 @@ msgid "Preview of"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_previous_activity_type_id
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:92
+#, python-format
+msgid "Previous"
+msgstr ""
+
+#. module: mail
+#: 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
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:76
+#, python-format
+msgid "Print"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__public
 #: model_terms: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:67
+#: code:addons/mail/static/src/xml/discuss.xml:228
 #, 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:1348
 #, python-format
 msgid "Public Channels"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_publisher_warranty_contract
+msgid "Publisher Warranty Contract"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.server,name:mail.ir_cron_module_update_notification_ir_actions_server
 #: model:ir.cron,cron_name:mail.ir_cron_module_update_notification
 #: model:ir.cron,name:mail.ir_cron_module_update_notification
@@ -4105,85 +4195,128 @@ msgid "Publisher: Update Notification"
 msgstr ""
 
 #. module: mail
+#: selection:ir.ui.view,type:0
+msgid "QWeb"
+msgstr ""
+
+#. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:179
 #, python-format
 msgid "Re:"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:400
+#, python-format
+msgid "Ready"
+msgstr ""
+
+#. module: mail
 #: selection:mail.notification,email_status:0
 msgid "Ready to Send"
 msgstr ""
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
+#: selection:mail.mail,state:0
 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
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
 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_resend_message__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model_terms: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_test_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 ""
 
 #. 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_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Regards,"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:186
+#, python-format
+msgid "Reject"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:186
+#, python-format
+msgid "Reject selected messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:414
+#, python-format
+msgid "Reject |"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,moderation_status:0
+#: selection:mail.message,moderation_status:0
+msgid "Rejected"
+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
 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
 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 ""
 
@@ -4193,108 +4326,141 @@ 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 ""
 
 #. module: mail
+#: selection:mail.activity.type,category:0
+msgid "Reminder"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:414
+#, python-format
+msgid "Remove message with explanation"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:416
+#, python-format
+msgid "Remove message without explanation"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_template_form
 msgid "Remove the contextual action to use this template on related documents"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:51
+#: code:addons/mail/static/src/xml/followers.xml:53
 #, python-format
 msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:203
+#: code:addons/mail/static/src/xml/thread.xml:343
 #: model_terms: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
 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
 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_mail_activity_mixin_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_note_note_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_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
+#: model:ir.actions.act_window,name:mail.mail_resend_message_action
+msgid "Resend mail"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid "Resend to selected"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__resend_wizard_id
+msgid "Resend wizard"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:69
+#, python-format
+msgid "Reset Zoom"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_user_id
 msgid "Responsible"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_tree
 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 ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:73
+#, python-format
+msgid "Rotate"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_email_template_search
 msgid "SMTP Server"
 msgstr ""
 
 #. 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 ""
 
@@ -4310,7 +4476,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_window.js:40
+#: code:addons/mail/static/src/js/thread_windows/abstract_thread_window.js:63
 #, python-format
 msgid "Say something"
 msgstr ""
@@ -4322,31 +4488,42 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:60
+#: code:addons/mail/static/src/xml/chatter.xml:93
 #, python-format
 msgid "Schedule activity"
 msgstr ""
 
 #. module: mail
+#: code:addons/mail/models/mail_activity.py:395
+#, 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:82
 #, 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_terms:ir.ui.view,arch_db:mail.email_template_form
 msgid "Scheduled Send Date"
 msgstr ""
 
 #. module: mail
+#: selection:ir.ui.view,type:0
+msgid "Search"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_search
 msgid "Search Alias"
 msgstr ""
@@ -4357,65 +4534,121 @@ 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_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Search Moderation List"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:183
+#, python-format
+msgid "Select All"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:183
+#, python-format
+msgid "Select all messages to moderate"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_email_template_preview__model_object_field
+#: model:ir.model.fields,help:mail.field_mail_template__model_object_field
 msgid ""
 "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."
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid ""
+"Select the action to do on each mail and correct the email address if "
+"needed. The modified address will be saved on the corresponding contact."
+msgstr ""
+
+#. module: mail
 #: selection:mail.channel,public:0
 msgid "Selected group of users"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:374
+#: code:addons/mail/static/src/js/composers/basic_composer.js:49
+#: code:addons/mail/static/src/js/discuss.js:148
+#: code:addons/mail/static/src/xml/composer.xml:16
 #: model_terms: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_resend_partner__resend
+msgid "Send Again"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_partner_mass_mail
+#: selection:ir.actions.server,state:0
+#: 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:265
 #, python-format
 msgid "Send Mail (%s)"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:72
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_tree
+#, python-format
 msgid "Send Now"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:53
+#: code:addons/mail/static/src/xml/chatter.xml:86
 #, python-format
 msgid "Send a message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:53
+#: code:addons/mail/static/src/js/discuss.js:145
+#, python-format
+msgid "Send explanation to author"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Send guidelines"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_guidelines
+msgid "Send guidelines to new subscribers"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:86
 #, python-format
 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."
@@ -4423,45 +4656,46 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:91
 #, 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:141
 #, python-format
 msgid "Sends messages by email"
 msgstr ""
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0
-#: selection:mail.notification,email_status:0
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:397
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
+#: selection:mail.mail,state:0 selection:mail.notification,email_status:0
+#, python-format
 msgid "Sent"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_email
-msgid "Sent by Email"
+#: model_terms:ir.ui.view,arch_db:mail.message_notification_email
+msgid "Sent by"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type_sequence
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_sequence
-msgid "Sequence"
-msgstr "Postupnosť"
+#: model:ir.model.fields,field_description:mail.field_mail_notification__is_email
+msgid "Sent by Email"
+msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:139
-#, python-format
-msgid "Settings"
+#: 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
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode_shortcode_type
-msgid "Shortcode Type"
+#: model:ir.model,name:mail.model_ir_actions_server
+msgid "Server Action"
 msgstr ""
 
 #. module: mail
@@ -4471,7 +4705,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 ""
 
@@ -4482,30 +4716,29 @@ 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:914
 #, 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
 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"
@@ -4513,12 +4746,12 @@ msgid ""
 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"
@@ -4526,12 +4759,12 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: selection:mail.shortcode,shortcode_type:0
-msgid "Smiley"
+#: selection:ir.actions.server,activity_user_type:0
+msgid "Specific User"
 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."
@@ -4539,70 +4772,39 @@ 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/xml/thread.xml:47
+#, python-format
+msgid "Split"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/services/mail_manager.js:1237
+#: code:addons/mail/static/src/xml/discuss.xml:33
+#: code:addons/mail/static/src/xml/discuss.xml:208
+#: 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
 #, 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_mail_activity_mixin_activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_state
-#: model:ir.model.fields,field_description:mail.field_note_note_activity_state
-#: model:ir.model.fields,field_description:mail.field_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.model.fields,field_description:mail.field_mail_moderation__status
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Status"
-msgstr "Stav"
-
-#. 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_mail_activity_mixin_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_request_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_production_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_repair_activity_state
-#: model:ir.model.fields,help:mail.field_mrp_unbuild_activity_state
-#: model:ir.model.fields,help:mail.field_note_note_activity_state
-#: model:ir.model.fields,help:mail.field_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
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_mixin__activity_state
+#: model:ir.model.fields,help:mail.field_res_partner__activity_state
 msgid ""
 "Status based on activities\n"
 "Overdue: Due date is already passed\n"
@@ -4611,33 +4813,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
+#: code:addons/mail/static/src/xml/discuss.xml:197
+#: 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
 #, 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_terms:ir.ui.view,arch_db:mail.email_template_form
 msgid "Subject (placeholders may be used here)"
 msgstr ""
@@ -4649,22 +4851,21 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:216
+#: code:addons/mail/static/src/xml/thread.xml:365
 #, 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_1986
-#: 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_terms:ir.ui.view,arch_db:mail.view_message_subtype_tree
 msgid "Subtype"
 msgstr ""
@@ -4676,24 +4877,41 @@ 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_ir_actions_server__activity_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 ""
 
 #. module: mail
 #: selection:mail.compose.message,message_type:0
 #: selection:mail.message,message_type:0
-#: selection:survey.mail.compose.message,message_type:0
 msgid "System notification"
 msgstr ""
 
 #. 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 ""
 
 #. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_change
+msgid "Technical field for UX related behaviour"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_type__initial_res_model_id
+msgid ""
+"Technical field to keep trace of the model at the beginning of the edition "
+"for UX related behaviour"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_ir_actions_server__activity_user_field_name
+msgid "Technical name of the user on the record"
+msgstr ""
+
+#. module: mail
 #: model:ir.actions.act_window,name:mail.wizard_email_template_preview
 msgid "Template Preview"
 msgstr ""
@@ -4708,25 +4926,40 @@ msgid "Templates"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_test
-msgid "Test Mail Model"
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+msgid "Thank you!"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "The"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/ir_actions.py:51
+#, python-format
+msgid "The 'Due Date In' value can't be negative."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_test_simple
-msgid "Test Simple Chatter Record"
+#: sql_constraint:mail.moderation:0
+msgid "The email address must be unique per channel !"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
+#: model_terms: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_test_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 "
@@ -4734,20 +4967,18 @@ msgid ""
 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_test_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 ""
 
 #. 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_test_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 "
@@ -4756,9 +4987,9 @@ msgid ""
 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:243
+#: code:addons/mail/models/mail_message.py:704
+#: code:addons/mail/models/mail_message.py:874
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -4767,18 +4998,13 @@ msgid ""
 msgstr ""
 
 #. 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
-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 ""
 
@@ -4788,14 +5014,26 @@ msgid "This"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_image
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity_view.xml:10
+#, python-format
+msgid "This action will send an email."
+msgstr ""
+
+#. module: mail
+#: 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 ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_public
+#: model:ir.model.fields,help:mail.field_mail_blacklist__email
+msgid "This field is case insensitive."
+msgstr ""
+
+#. module: mail
+#: 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."
@@ -4807,53 +5045,44 @@ 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 ""
 
 #. module: mail
+#: model:mail.activity.type,name:mail.mail_activity_data_todo
+msgid "To Do"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:14
-#: code:addons/mail/static/src/xml/extended_chat_window.xml:7
+#: code:addons/mail/static/src/xml/chatter.xml:39
+#: code:addons/mail/static/src/xml/thread_window.xml:10
 #, python-format
 msgid "To:"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:26
-#: code:addons/mail/static/src/js/thread.js:240
-#: code:addons/mail/static/src/xml/systray.xml:75
-#: selection:crm.lead,activity_state:0 selection:event.track,activity_state:0
-#: selection:hr.applicant,activity_state:0 selection:mail.activity,state:0
+#: code:addons/mail/static/src/js/activity.js:83
+#: code:addons/mail/static/src/js/models/messages/abstract_message.js:107
+#: code:addons/mail/static/src/xml/systray.xml:96
+#: selection:mail.activity,state:0
 #: selection:mail.activity.mixin,activity_state:0
-#: selection:maintenance.equipment,activity_state:0
-#: selection:maintenance.request,activity_state:0
-#: selection:mrp.production,activity_state:0
-#: selection:mrp.repair,activity_state:0
-#: selection:mrp.unbuild,activity_state:0 selection:note.note,activity_state:0
-#: selection:product.product,activity_state:0
-#: selection:product.template,activity_state:0
-#: selection:project.task,activity_state:0
-#: selection:purchase.order,activity_state:0
 #: selection:res.partner,activity_state:0
-#: selection:sale.order,activity_state:0
-#: selection:stock.picking,activity_state:0
-#: selection:survey.survey,activity_state:0
 #, python-format
 msgid "Today"
 msgstr ""
@@ -4865,13 +5094,8 @@ msgid "Today Activities"
 msgstr ""
 
 #. module: mail
-#: model:mail.activity.type,name:mail.mail_activity_data_todo
-msgid "Todo"
-msgstr ""
-
-#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:36
+#: code:addons/mail/static/src/js/activity.js:93
 #, python-format
 msgid "Tomorrow"
 msgstr ""
@@ -4882,17 +5106,16 @@ 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
 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_terms:ir.ui.view,arch_db:mail.view_message_form
 msgid "Tracking"
 msgstr ""
@@ -4910,41 +5133,95 @@ 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_tracking_value__track_sequence
+msgid "Tracking field sequence"
+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
 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
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Tree"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity_view.xml:23
+#, python-format
+msgid ""
+"Try to add some activity on records, or make sure that\n"
+"                there is no active filter in the search bar."
+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_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
 msgid "Type"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_uuid
+#: model:ir.model.fields,help:mail.field_mail_activity_type__delay_from
+msgid "Type of delay"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_ir_actions_server__state
+msgid ""
+"Type of server action. The following values are available:\n"
+"- 'Execute Python Code': a block of python code that will be executed\n"
+"- 'Create or Copy a new Record': create a new record with new values, or copy an existing record in your database\n"
+"- 'Write on a Record': update the values of a record\n"
+"- 'Execute several actions': define an action that triggers several other server actions\n"
+"- 'Add Followers': add followers to a record (available in Discuss)\n"
+"- 'Send Email': automatically send an email (available in email_template)"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__uuid
 msgid "UUID"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:235
+#: code:addons/mail/models/mail_mail.py:241
 #, python-format
 msgid "Unable to connect to SMTP Server"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_message.py:31
+#: code:addons/mail/models/mail_thread.py:2207
 #, python-format
-msgid "Unable to send email, please configure the sender's email address."
+msgid "Unable to log message, please configure the sender's email address."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:2172
+#, python-format
+msgid "Unable to notify message, please configure the sender's email address."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_message.py:34
+#, python-format
+msgid "Unable to post message, please configure the sender's email address."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread_windows/abstract_thread_window.js:163
+#, python-format
+msgid "Undefined"
 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"
@@ -4957,200 +5234,134 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: 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_message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple_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_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
+msgid "Unit"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_type__delay_unit
+msgid "Unit of delay"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_notification.py:52
+#: selection:mail.notification,failure_type:0
+#, python-format
+msgid "Unknown error"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread
 msgid "Unread Messages"
-msgstr "Neprečítané správy"
-
-#. 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_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_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
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__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_thread__message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
 msgid "Unread Messages Counter"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/abstract_thread_window.xml:35
 #: model_terms:ir.ui.view,arch_db:mail.view_message_search
+#, python-format
 msgid "Unread messages"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:184
+#, python-format
+msgid "Unselect All"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:184
+#, python-format
+msgid "Unselect all messages to moderate"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:180
 #, 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:180
 #, 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/js/discuss.js:341
 #, python-format
 msgid "Unsubscribe"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/models/mail_template.py:473
 #, python-format
-msgid "Unsubscribe from channel"
+msgid "Unsupported report type %s found."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:510
+#: code:addons/mail/models/mail_message.py:188
 #, python-format
-msgid "Unsupported report type %s found."
+msgid "Unsupported search filter on moderation status"
+msgstr ""
+
+#. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Update the Record"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:322
+#: code:addons/mail/static/src/xml/thread.xml:531
+#, python-format
+msgid "Uploaded"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:523
 #, python-format
 msgid "Uploading"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:651
+#: code:addons/mail/static/src/js/composers/basic_composer.js:242
 #, 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,help:mail.field_ir_actions_server__activity_user_type
+msgid ""
+"Use 'Specific User' to always assign the same user on the next activity. Use"
+" 'Generic User From Record' to specify the field name of the user to choose "
+"on the record."
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_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
 msgid "Use template"
 msgstr ""
 
@@ -5160,21 +5371,29 @@ 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 ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:61
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_search
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_tree
+#, python-format
 msgid "User"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_user_field_name
+msgid "User field name"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:51
-#: code:addons/mail/static/src/xml/extended_chat_window.xml:8
+#: code:addons/mail/static/src/xml/discuss.xml:62
+#: code:addons/mail/static/src/xml/thread_window.xml:11
 #, python-format
 msgid "User name"
 msgstr ""
@@ -5185,7 +5404,7 @@ msgid "Users"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:711
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5199,21 +5418,58 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:670
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:41
+#, python-format
+msgid "Video"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:747
+#: model:ir.model,name:mail.model_ir_ui_view
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
+#: model_terms:ir.ui.view,arch_db:mail.message_activity_assigned
 #: model_terms: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:745
 #, python-format
 msgid "View %s"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_act_window_view__view_mode
+#: model:ir.model.fields,field_description:mail.field_ir_ui_view__type
+msgid "View Type"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:99
+#, python-format
+msgid "View all the attachments of the current record"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:57
+#, python-format
+msgid "Viewer"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/followers.xml:85
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:240
+#: code:addons/mail/static/src/js/followers.js:243
 #, python-format
 msgid ""
 "Warning! \n"
@@ -5222,35 +5478,39 @@ 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
+#: selection:ir.actions.server,activity_date_deadline_range_type:0
+msgid "Weeks"
+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
 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
 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 ""
 
@@ -5261,7 +5521,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:75
+#: code:addons/mail/static/src/xml/activity.xml:96
 #, python-format
 msgid "Write Feedback"
 msgstr ""
@@ -5275,67 +5535,96 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:30
-#: code:addons/mail/static/src/js/thread.js:242
+#: code:addons/mail/static/src/js/activity.js:87
+#: code:addons/mail/static/src/js/models/messages/abstract_message.js:109
 #, 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:101
 #, 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:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:677
+#. openerp-web
+#: code:addons/mail/static/src/js/discuss.js:367
+#, python-format
+msgid "You are going to ban: %s. Do you confirm the action?"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/discuss.js:390
+#, python-format
+msgid "You are going to discard %s messages. Do you confirm the action?"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/discuss.js:394
+#, python-format
+msgid "You are going to discard 1 message. Do you confirm the action?"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid ""
+"You are going to send the guidelines to all the subscribers. Do you confirm "
+"the action?"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:925
 #, 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:919
 #, 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/js/discuss.js:338
 #, python-format
 msgid ""
-"You can mark any message as 'starred', and it shows up in this channel."
+"You are the administrator of this channel. Are you sure you want to "
+"unsubscribe?"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/res_users.py:53
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:135
 #, python-format
 msgid ""
-"You cannot create a new user from here.\n"
-" To create new user please go to configuration panel."
+"You can mark any message as 'starred', and it shows up in this mailbox."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:144
+#: code:addons/mail/models/res_users.py:87
 #, python-format
 msgid ""
-"You cannot delete those groups, as the Whole Company group is required by "
-"other modules."
+"You cannot create a new user from here.\n"
+" To create new user please go to configuration panel."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:349
+#: code:addons/mail/models/mail_channel.py:241
 #, python-format
 msgid ""
-"You could also add a new %(document)s by sending an email to: "
-"%(email_link)s."
+"You cannot delete those groups, as the Whole Company group is required by "
+"other modules."
 msgstr ""
 
 #. module: mail
@@ -5345,14 +5634,26 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:579
+#: code:addons/mail/static/src/js/services/mail_notification_manager.js:198
 #, 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_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+msgid "You have messages to moderate, please go for the proceedings."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:138
+#, python-format
+msgid "You have no message to moderate"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_email_template_preview__attachment_ids
+#: model:ir.model.fields,help:mail.field_mail_template__attachment_ids
 msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
@@ -5360,61 +5661,130 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:473
+#: code:addons/mail/static/src/js/services/mail_notification_manager.js:444
 #, 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/mail_notification_manager.js:439
 #, 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:291
 #, python-format
 msgid "You:"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_light
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
+msgid "Your"
+msgstr ""
+
+#. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:83
+#: code:addons/mail/static/src/js/thread_field.js:91
 #, python-format
 msgid "Your message has not been sent."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/ir_actions.py:30
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:424
+#, python-format
+msgid "Your message is pending moderation"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:198
+#, python-format
+msgid "Your message was rejected by moderator."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/ir_actions.py:57
 #, python-format
 msgid "Your template should define email_from"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:68
+#, python-format
+msgid "Zoom In"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:70
+#, python-format
+msgid "Zoom Out"
+msgstr ""
+
+#. module: mail
+#: selection:mail.activity.type,delay_from:0
+msgid "after previous activity deadline"
+msgstr ""
+
+#. module: mail
+#: selection:mail.activity.type,delay_from:0
+msgid "after validation date"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:1074
 #, python-format
 msgid "alias %s: %s"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.message_activity_assigned
+msgid "assigned you an activity"
+msgstr ""
+
+#. module: mail
 #: model:mail.channel,name:mail.channel_2
 msgid "board-meetings"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
+#, python-format
 msgid "by"
 msgstr ""
 
 #. module: mail
+#: model_terms: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_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:315
+#: selection:mail.activity.type,delay_unit:0
+msgid "days"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:357
 #, python-format
 msgid "document"
 msgstr ""
@@ -5427,20 +5797,21 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
-msgid "e.g. Discuss proposal"
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:45
+#, python-format
+msgid "e.g. 1-5, 7, 8-9"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:11
-#, python-format
-msgid "enable desktop notifications"
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model_terms:ir.ui.view,arch_db:mail.view_server_action_form_template
+msgid "e.g. Discuss proposal"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:189
+#: code:addons/mail/static/src/js/followers.js:190
 #, python-format
 msgid "followers"
 msgstr ""
@@ -5468,46 +5839,31 @@ msgid "has been"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:282
+#: code:addons/mail/models/mail_alias.py:272
 #, python-format
 msgid "incorrectly configured alias"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:278
+#: code:addons/mail/models/mail_alias.py:268
 #, python-format
 msgid "incorrectly configured alias (unknown reference record)"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_ir_actions_server
-msgid "ir.actions.server"
-msgstr ""
-
-#. module: mail
-#: model:ir.model,name:mail.model_ir_autovacuum
-msgid "ir.autovacuum"
-msgstr ""
-
-#. module: mail
-#: model:ir.model,name:mail.model_mail_alias_mixin
-msgid "mail.alias.mixin"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_thread.py:943
+#: code:addons/mail/models/mail_thread.py:1051
 #, 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:1046
 #, 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:1039
 #, python-format
 msgid ""
 "model %s does not accept document update, fall back on document creation"
@@ -5519,27 +5875,41 @@ msgid "modified"
 msgstr ""
 
 #. module: mail
+#: selection:mail.activity.type,delay_unit:0
+msgid "months"
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
 msgid "mycompany.odoo.com"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread.js:21
+#: code:addons/mail/static/src/js/utils.js:108
 #, python-format
 msgid "now"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:177
+#: code:addons/mail/static/src/xml/thread.xml:323
+#: model_terms:ir.ui.view,arch_db:mail.message_activity_assigned
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:71
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:55
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:1021
 #, python-format
 msgid ""
 "posting a message without model should be with a null res_id (private "
@@ -5547,32 +5917,27 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:917
+#: code:addons/mail/models/mail_thread.py:1025
 #, python-format
 msgid ""
 "posting a message without model should be with a parent_id (private message)"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr ""
-
-#. module: mail
 #: model:mail.channel,name:mail.channel_3
 msgid "rd"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread.js:17
+#: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
 msgid "read less"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread.js:16
+#: code:addons/mail/static/src/js/thread_widget.js:19
 #, python-format
 msgid "read more"
 msgstr ""
@@ -5583,42 +5948,37 @@ msgid "record:"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:935
+#: code:addons/mail/models/mail_thread.py:1043
 #, 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:1036
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_res_config_settings
-msgid "res.config.settings"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:1021
 #, python-format
 msgid "resetting thread_id"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:254
+#: code:addons/mail/models/mail_channel.py:407
 #, 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:277
 #, python-format
 msgid "restricted to followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_alias.py:291
+#: code:addons/mail/models/mail_alias.py:281
 #, python-format
 msgid "restricted to known authors"
 msgstr ""
@@ -5629,30 +5989,50 @@ msgid "sales"
 msgstr ""
 
 #. module: mail
-#: 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:1025
+#: code:addons/mail/models/mail_thread.py:1043
+#: code:addons/mail/models/mail_thread.py:1046
+#: code:addons/mail/models/mail_thread.py:1051
+#: code:addons/mail/models/mail_thread.py:1074
 #, python-format
 msgid "skipping"
 msgstr ""
 
 #. module: mail
+#: model_terms: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
+#: code:addons/mail/static/src/xml/chatter.xml:45
 #, python-format
 msgid "this document"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:966
+#: model_terms:ir.ui.view,arch_db:mail.message_activity_assigned
+msgid "to close for"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:1074
 #, python-format
 msgid "unknown error"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:906
+#: code:addons/mail/models/mail_thread.py:1014
 #, python-format
 msgid "unknown target model %s"
 msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.message_notification_email
+msgid "using"
+msgstr ""
+
+#. module: mail
+#: selection:mail.activity.type,delay_unit:0
+msgid "weeks"
+msgstr ""
diff --git a/addons/mail/i18n/sr.po b/addons/mail/i18n/sr.po
index a2f4835d16e..06967627c6e 100644
--- a/addons/mail/i18n/sr.po
+++ b/addons/mail/i18n/sr.po
@@ -7,10 +7,10 @@
 # Slobodan Simić <slsimic@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Slobodan Simić <slsimic@gmail.com>, 2018\n"
 "Language-Team: Serbian (https://www.transifex.com/odoo/teams/41243/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ 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
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -133,21 +133,7 @@ msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -158,7 +144,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -167,7 +153,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -175,8 +161,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -709,7 +695,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2263,8 +2249,9 @@ msgid "Guidelines"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2311,6 +2298,7 @@ msgstr ""
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2545,7 +2533,8 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2799,7 +2788,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2818,7 +2807,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
@@ -4081,6 +4070,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4726,7 +4720,7 @@ msgid "Show all records which has next action date is before today"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr ""
@@ -5414,7 +5408,7 @@ msgid "Users"
 msgstr "Korisnici"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5559,7 +5553,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr ""
@@ -5593,13 +5587,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr ""
@@ -5759,6 +5753,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5774,6 +5773,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr ""
@@ -5924,6 +5928,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -5979,6 +5988,11 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/tr.po b/addons/mail/i18n/tr.po
index 4fcea926e35..ec293cbe6ba 100644
--- a/addons/mail/i18n/tr.po
+++ b/addons/mail/i18n/tr.po
@@ -24,10 +24,10 @@
 # Buket Şeker <buket_skr@hotmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Buket Şeker <buket_skr@hotmail.com>, 2018\n"
 "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, 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."
@@ -150,21 +150,7 @@ msgid "0 Today"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -175,7 +161,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -184,7 +170,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -194,8 +180,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -744,7 +730,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2324,8 +2310,9 @@ msgid "Guidelines"
 msgstr "Yönergeleri okuyun"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2372,6 +2359,7 @@ msgstr "Başlıklar"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2615,7 +2603,8 @@ msgstr ""
 "'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2869,7 +2858,7 @@ msgstr "İzin"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2888,7 +2877,7 @@ msgid ""
 msgstr "Bu belgenin takipçisi olarak eklenecek iş ortakları."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
@@ -3072,7 +3061,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_main_attachment_id
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_main_attachment_id
 msgid "Main Attachment"
-msgstr ""
+msgstr "Ana Ek"
 
 #. module: mail
 #. openerp-web
@@ -3775,7 +3764,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_has_error_counter
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_has_error_counter
 msgid "Number of error"
-msgstr ""
+msgstr "Hata Sayısı"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_blacklist__message_needaction_counter
@@ -4185,6 +4174,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4841,7 +4835,7 @@ 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:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "Bir yardımcı mesajı göster"
@@ -5562,7 +5556,7 @@ msgid "Users"
 msgstr "Kullanıcılar"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
@@ -5715,7 +5709,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Bu kanalda yalnızsın."
@@ -5749,13 +5743,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, 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:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "<b>#%s</b> kanalındasınız."
@@ -5921,6 +5915,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "yönetim kurulu toplantıları"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5936,6 +5935,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "oluşturuldu"
@@ -6086,6 +6090,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "rd"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6141,6 +6150,11 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "satışlar"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/uk.po b/addons/mail/i18n/uk.po
index aa22bb86cfc..5b4eed4e7a2 100644
--- a/addons/mail/i18n/uk.po
+++ b/addons/mail/i18n/uk.po
@@ -9,10 +9,10 @@
 # Bohdan Lisnenko, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
 "Last-Translator: Bohdan Lisnenko, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -137,21 +137,7 @@ msgid "0 Today"
 msgstr "0 Сьогодні"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -162,7 +148,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -174,7 +160,7 @@ msgstr ""
 "id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -184,8 +170,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -756,7 +742,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -2345,8 +2331,9 @@ msgid "Guidelines"
 msgstr "Путівники"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2393,6 +2380,7 @@ msgstr "Заголовки"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2642,7 +2630,8 @@ msgstr ""
 "наприклад \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2898,7 +2887,7 @@ msgstr "Покинути"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2918,7 +2907,7 @@ msgstr ""
 "Список партнерів, які будуть додані як підписники поточного документа."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr "Список користувачів у поточному каналі"
@@ -4223,6 +4212,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4881,7 +4875,7 @@ msgid "Show all records which has next action date is before today"
 msgstr "Показати всі записи, які мають дату наступної дії до сьогоднішньої"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "Показати допоміжне повідомлення"
@@ -5611,7 +5605,7 @@ msgid "Users"
 msgstr "Користувачі"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Користувачі в цьому каналі: %s %s та ви."
@@ -5769,7 +5763,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr "Ви додали <b>%s</b> до розмови."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Ви одні в цьому каналі."
@@ -5803,13 +5797,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, 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:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Ви у каналі <b>#%s</b>."
@@ -5975,6 +5969,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "Зустрічі учасників"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5990,6 +5989,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "створено"
@@ -6147,6 +6151,11 @@ msgstr ""
 "повідомлення)"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "rd"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6204,6 +6213,11 @@ msgid "restricted to known authors"
 msgstr "обмежено відомими авторами"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "продаж"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/vi.po b/addons/mail/i18n/vi.po
index bfb8067d20b..a6942c2c389 100644
--- a/addons/mail/i18n/vi.po
+++ b/addons/mail/i18n/vi.po
@@ -14,13 +14,14 @@
 # Minh Nguyen <ndminh210994@gmail.com>, 2018
 # Support W360s <support@w360s.com>, 2018
 # Dang Hanh <hanh.dtm@komit-consulting.com>, 2018
+# khoibv Mr <kendev2009@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
-"Last-Translator: Dang Hanh <hanh.dtm@komit-consulting.com>, 2018\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
+"Last-Translator: khoibv Mr <kendev2009@gmail.com>, 2018\n"
 "Language-Team: Vietnamese (https://www.transifex.com/odoo/teams/41243/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +30,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -143,21 +144,7 @@ msgid "0 Today"
 msgstr "0 Hôm nay"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -168,7 +155,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -177,7 +164,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -187,8 +174,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -760,7 +747,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -837,7 +824,7 @@ msgstr "Đính kèm"
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_attachment_count
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_attachment_count
 msgid "Attachment Count"
-msgstr ""
+msgstr "Số đính kèm"
 
 #. module: mail
 #. openerp-web
@@ -2352,8 +2339,9 @@ msgid "Guidelines"
 msgstr ""
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2400,6 +2388,7 @@ msgstr "Tiêu đề"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr "Xin chào"
 
@@ -2649,7 +2638,8 @@ msgstr ""
 "đen, ví dụ \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2905,7 +2895,7 @@ msgstr "Nghỉ"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2927,7 +2917,7 @@ msgstr ""
 "hành."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr "Liệt kê người dùng ở Kênh hiện hành"
@@ -3111,7 +3101,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_main_attachment_id
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_main_attachment_id
 msgid "Main Attachment"
-msgstr ""
+msgstr "Đính kèm chính"
 
 #. module: mail
 #. openerp-web
@@ -4230,6 +4220,11 @@ msgid "Please contact us instead using"
 msgstr "Vui lòng liên lạc với chúng tôi thay vì sử dụng"
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4887,7 +4882,7 @@ msgid "Show all records which has next action date is before today"
 msgstr "Hiển thị tất cả dữ liệu có ngày xử lý tiếp theo trước ngày hôm nay"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "Hiển thị một thông điệp trợ giúp"
@@ -5607,7 +5602,7 @@ msgid "Users"
 msgstr "Người dùng"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "Người dùng trong kênh này: %s %s và bạn."
@@ -5764,7 +5759,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr "Bạn đã thêm <b>%s</b> vào cuộc hội thoại"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "Chỉ có mình bạn trong kênh này."
@@ -5801,13 +5796,13 @@ msgstr ""
 " xác nhận hành động này?"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr "Bạn đang trong một cuộc hội thoại riêng tư với <b>@%s</b>."
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "Bạn đang ở kênh <b>#%s</b>."
@@ -5977,6 +5972,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5992,6 +5992,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "đã được tạo"
@@ -6149,6 +6154,11 @@ msgstr ""
 "đăng một tin nhắn không có mô hình nên có một parent_id (tin nhắn riêng)"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "rd"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6204,6 +6214,11 @@ msgid "restricted to known authors"
 msgstr "giới hạn tác giả đã biết"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "bán hàng"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 52078fa853a..6d7f0ab6b0e 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.po
@@ -5,7 +5,7 @@
 # Translators:
 # Martin Trigaux, 2018
 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2018
-# 珠海-杜哥 <liangjia@qq.com>, 2018
+# liAnGjiA <liangjia@qq.com>, 2018
 # Emily JIA <eji@odoo.com>, 2018
 # 卓忆科技 <zhanghao@jointd.com>, 2018
 # v2exerer <9010446@qq.com>, 2018
@@ -20,16 +20,19 @@
 # snow wang <147156565@qq.com>, 2018
 # Youfu Sheng <wdmsyf@sina.com>, 2018
 # diaojiaolou <124412206@qq.com>, 2018
-# keecome <7017511@qq.com>, 2018
+# 广州救火 <7017511@qq.com>, 2018
 # 演奏王 <wangwhai@qq.com>, 2018
 # 湘子 南 <1360857908@qq.com>, 2018
+# Gary Wei <Gary.wei@elico-corp.com>, 2018
+# e2f_cn c7 <e2f_cn_c7@outlook.com>, 2018
+# rejen he <251442037@qq.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
-"Last-Translator: 湘子 南 <1360857908@qq.com>, 2018\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
+"Last-Translator: rejen he <251442037@qq.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"
@@ -38,7 +41,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr "这个频道是私有的. 只有被邀请的人才可以参与."
@@ -151,30 +154,7 @@ msgid "0 Today"
 msgstr "0 今天"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>你好${object.name or ''},</p>\n"
-"<p>请在下面发现频道 ${ctx['channel'].name} 的指南.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -190,7 +170,7 @@ msgstr ""
 " 您可以通过键入 <b>:快捷方式</b>在您的消息中插入预设回复。<br>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -202,7 +182,7 @@ msgstr ""
 "id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -212,8 +192,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -777,7 +757,7 @@ msgstr "发送邮件时出现一个错误"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -1344,7 +1324,7 @@ msgstr "恭喜，你的收件箱是空的！"
 #. module: mail
 #: selection:mail.notification,failure_type:0
 msgid "Connection failed (outgoing mail server problem)"
-msgstr "连接失败(发送邮件服务器问题)"
+msgstr "连接失败(发件服务器问题)"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner
@@ -2335,9 +2315,10 @@ msgid "Guidelines"
 msgstr "方针"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
-msgstr "频道指引 ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
+msgstr "渠道指南%s"
 
 #. module: mail
 #: selection:res.users,notification_type:0
@@ -2383,6 +2364,7 @@ msgstr "头信息"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr "您好"
 
@@ -2617,7 +2599,8 @@ msgid ""
 msgstr "错误的表达式，必须是符合文法的python字典定义，例如： \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr "初级邮件模型中无效的部分 %s"
@@ -2871,7 +2854,7 @@ msgstr "休假"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2890,7 +2873,7 @@ msgid ""
 msgstr "列表中的业务伙伴将添加至当前单据的关注者。"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr "在当前频道列出用户"
@@ -3310,7 +3293,7 @@ msgstr "消息搜索"
 #: code:addons/mail/static/src/js/tour.js:20
 #, python-format
 msgid "Messages can be <b>starred</b> to remind you to check back later."
-msgstr "消息可以 <b>starred</b> 以提醒你后面再来检查."
+msgstr "消息允许 <b>星标</b> 标出来以便提醒您过后查看."
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_message_subtype__internal
@@ -3570,7 +3553,7 @@ msgstr "新建消息"
 #: code:addons/mail/static/src/xml/thread.xml:131
 #, python-format
 msgid "New messages appear here."
-msgstr "新消息出现在这里"
+msgstr "Odoo中的新消息都出现在这儿。"
 
 #. module: mail
 #. openerp-web
@@ -3689,7 +3672,7 @@ msgstr "没有标星的消息"
 #: 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
 msgid "No threading for answers"
-msgstr "答案没有线程"
+msgstr "线程无应答"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_note
@@ -3958,7 +3941,7 @@ msgstr "出局"
 #: 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 "发信邮件服务器"
+msgstr "发件服务器"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_mail
@@ -3970,7 +3953,7 @@ msgstr "出去的邮件"
 #: 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
 msgid "Outgoing mail server"
-msgstr "发信邮件服务器"
+msgstr "发件服务器"
 
 #. module: mail
 #: selection:mail.activity,state:0
@@ -4160,6 +4143,11 @@ msgid "Please contact us instead using"
 msgstr "不要使用，请联系我们"
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr "请在下列方式中查找"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4814,7 +4802,7 @@ msgid "Show all records which has next action date is before today"
 msgstr "显示在今天之前的下一个行动日期的所有记录"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "显示帮助者信息"
@@ -5520,7 +5508,7 @@ msgid "Users"
 msgstr "用户"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "在此频道的用户 : %s %s 以及 你."
@@ -5670,7 +5658,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr "您添加了 <b>%s</b> 到对话。"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "你是此频道的唯一人"
@@ -5704,13 +5692,13 @@ msgid ""
 msgstr "你将向所有订户发送指南。你确订要这么做吗？"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, 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:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "你在频道 <b>#%s</b>"
@@ -5872,6 +5860,11 @@ msgid "assigned you an activity"
 msgstr "指派给你一个活动"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "董事会－会议"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5889,6 +5882,11 @@ msgstr ""
 "        用于收集答复，不用于直接联系。"
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr "频道"
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "创建"
@@ -6039,6 +6037,11 @@ msgid ""
 msgstr "发布无模型消息应使用 parent_id（私人信息）"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "研发"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6094,6 +6097,11 @@ msgid "restricted to known authors"
 msgstr "仅限于已知的作者"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "销售"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046
diff --git a/addons/mail/i18n/zh_TW.po b/addons/mail/i18n/zh_TW.po
index e68687612f2..87146fda3d7 100644
--- a/addons/mail/i18n/zh_TW.po
+++ b/addons/mail/i18n/zh_TW.po
@@ -6,13 +6,15 @@
 # Martin Trigaux, 2018
 # 敬雲 林 <chingyun@yuanchih-consult.com>, 2018
 # sejun huang <sejun.huang@gmail.com>, 2018
+# Michael Yeung, 2018
+# Kulius Ray <kulius@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
-"Last-Translator: sejun huang <sejun.huang@gmail.com>, 2018\n"
+"POT-Creation-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-10-08 06:49+0000\n"
+"Last-Translator: Kulius Ray <kulius@gmail.com>, 2018\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/odoo/teams/41243/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:917
+#: code:addons/mail/models/mail_channel.py:921
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr "這個頻道是私有的. 只有被邀請的人才可以參與."
@@ -134,21 +136,7 @@ msgid "0 Today"
 msgstr "0 今天"
 
 #. module: mail
-#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"<p>Hello ${object.name or ''},</p>\n"
-"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
-"<p>\n"
-"${ctx['channel'].moderation_guidelines_msg}\n"
-"</p>\n"
-"<p/>\n"
-"</div>\n"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:926
 #, python-format
 msgid ""
 "<br><br>\n"
@@ -159,7 +147,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:721
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a "
@@ -168,7 +156,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:824
+#: code:addons/mail/models/mail_channel.py:828
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">created <a href=\"#\" "
@@ -178,8 +166,8 @@ msgstr ""
 "class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:724
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:728
+#: code:addons/mail/models/mail_channel.py:802
 #, python-format
 msgid ""
 "<div class=\"o_mail_notification\">joined <a href=\"#\" "
@@ -424,12 +412,12 @@ msgstr "待做的動作"
 #. module: mail
 #: model:ir.model,name:mail.model_ir_actions_act_window_view
 msgid "Action Window View"
-msgstr ""
+msgstr "動作窗視圖"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_message_subtype__default
 msgid "Activated by default when subscribing."
-msgstr "訂閱時預設激活。"
+msgstr "訂閱時預設啟動。"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_activity_type__active
@@ -501,7 +489,7 @@ msgstr "活動類型"
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_user_type
 msgid "Activity User Type"
-msgstr ""
+msgstr "活動使用者類型"
 
 #. module: mail
 #. openerp-web
@@ -601,7 +589,7 @@ msgstr "添加頻道到通知中  ..."
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model_terms:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 msgid "Add contacts to notify..."
-msgstr "添加聯繫人以發出通知  ..."
+msgstr "添加聯絡人以發出通知  ..."
 
 #. module: mail
 #. openerp-web
@@ -613,7 +601,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
 msgid "Additional Contacts"
-msgstr "額外的聯繫人"
+msgstr "額外的聯絡人"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -737,7 +725,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #: code:addons/mail/static/src/js/models/messages/message.js:148
 #, python-format
 msgid "Anonymous"
@@ -834,7 +822,7 @@ msgstr "附件"
 msgid ""
 "Attachments are linked to a document through model / res_id and to the "
 "message through this field."
-msgstr "附件通過模型/res_id 鏈接到文檔並通過該字段鏈接到消息。"
+msgstr "附件通過模型/res_id 鏈接到文件並通過該字段鏈接到消息。"
 
 #. module: mail
 #: selection:mail.alias,alias_contact:0
@@ -916,7 +904,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_ir_autovacuum
 msgid "Automatic Vacuum"
-msgstr ""
+msgstr "自動設為空白"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_notify
@@ -973,7 +961,7 @@ msgstr "致以最誠摯的問候，"
 #: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_blacklisted
 #: model:ir.model.fields,field_description:mail.field_res_partner__is_blacklisted
 msgid "Blacklist"
-msgstr ""
+msgstr "黑名單"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_tree
@@ -1280,7 +1268,7 @@ msgstr "寫作模式"
 #. module: mail
 #: model:ir.model,name:mail.model_res_config_settings
 msgid "Config Settings"
-msgstr "配置設置"
+msgstr "配置設定"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
@@ -1542,7 +1530,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_activity_type__delay_from
 msgid "Delay Type"
-msgstr ""
+msgstr "延遲類型"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_activity_type__delay_unit
@@ -1708,7 +1696,7 @@ msgstr "相關單據的顯示名稱。"
 msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
-msgstr "不要在文檔通信歷史中保留電子信件副本（僅限群發信件）"
+msgstr "不要在文件通信歷史中保留電子信件副本（僅限群發信件）"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_document_file_kanban
@@ -1776,7 +1764,7 @@ msgstr "截止日期"
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_date_deadline_range
 msgid "Due Date In"
-msgstr ""
+msgstr "截止日期至"
 
 #. module: mail
 #. openerp-web
@@ -1788,7 +1776,7 @@ msgstr "截至 %d 天"
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_date_deadline_range_type
 msgid "Due type"
-msgstr ""
+msgstr "截止類型"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_template_form
@@ -1851,7 +1839,7 @@ msgstr "電郵別名"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_alias_mixin
 msgid "Email Aliases Mixin"
-msgstr ""
+msgstr "電郵別名"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_tree
@@ -2295,8 +2283,9 @@ msgid "Guidelines"
 msgstr "方針"
 
 #. module: mail
-#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
-msgid "Guidelines of channel ${ctx['channel'].name}"
+#: code:addons/mail/models/mail_channel.py:448
+#, python-format
+msgid "Guidelines of channel %s"
 msgstr ""
 
 #. module: mail
@@ -2332,7 +2321,7 @@ msgstr "有附件"
 #: model:ir.model.fields,help:mail.field_mail_mail__has_error
 #: model:ir.model.fields,help:mail.field_mail_message__has_error
 msgid "Has error"
-msgstr ""
+msgstr "有誤差"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_mail__headers
@@ -2343,6 +2332,7 @@ msgstr "標題"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
 msgid "Hello"
 msgstr ""
 
@@ -2443,7 +2433,7 @@ msgstr "如果勾選此項，有新消息會提醒您。"
 #: model:ir.model.fields,help:mail.field_mail_thread__message_has_error
 #: model:ir.model.fields,help:mail.field_res_partner__message_has_error
 msgid "If checked, some messages have a delivery error."
-msgstr ""
+msgstr "如果勾選此項， 某些信息將會產生傳遞錯誤。"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
@@ -2482,7 +2472,7 @@ msgstr "如果設定完畢，隊列管理員將在指定日期之後發送電子
 msgid ""
 "If the email address is on the blacklist, the contact won't receive mass "
 "mailing anymore, from any list"
-msgstr ""
+msgstr "存在於黑名單的電子信件表示收件者不會再收到任何列表的群發信件。"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
@@ -2577,7 +2567,8 @@ msgid ""
 msgstr "錯誤的表達式，必須是符合文法的python字典定義，例如： \"{'field': 'value'}\""
 
 #. module: mail
-#: code:addons/mail/models/mail_blacklist.py:73
+#: code:addons/mail/models/mail_blacklist.py:126
+#: code:addons/mail/models/mail_blacklist.py:129
 #, python-format
 msgid "Invalid primary email field on model %s"
 msgstr ""
@@ -2831,7 +2822,7 @@ msgstr "退出"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/models/mail_channel.py:935
 #: code:addons/mail/static/src/xml/discuss.xml:147
 #, python-format
 msgid "Leave this channel"
@@ -2841,7 +2832,7 @@ msgstr "退出此頻道"
 #: 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 "將被添加為目前文檔的偵聽器的頻道列表。"
+msgstr "將被添加為目前文件的偵聽器的頻道列表。"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_wizard_invite__partner_ids
@@ -2850,7 +2841,7 @@ msgid ""
 msgstr "列表中的業務夥伴將添加至目前單據的關注者。"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:942
+#: code:addons/mail/models/mail_channel.py:946
 #, python-format
 msgid "List users in the current channel"
 msgstr "在目前頻道列出使用者"
@@ -3132,7 +3123,7 @@ msgstr "這些群組的成員將自動添加為關注者。注意,如果有必�
 #. module: mail
 #: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
 msgid "Merge Partner Wizard"
-msgstr ""
+msgstr "合併業務夥伴嚮導"
 
 #. module: mail
 #: code:addons/mail/wizard/base_partner_merge.py:13
@@ -3156,7 +3147,7 @@ msgstr "消息"
 #: model:ir.model.fields,field_description:mail.field_mail_thread__message_has_error
 #: model:ir.model.fields,field_description:mail.field_res_partner__message_has_error
 msgid "Message Delivery error"
-msgstr "郵件傳遞錯誤"
+msgstr "信件傳遞錯誤"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
@@ -3334,7 +3325,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_mail__moderator_id
 #: model:ir.model.fields,field_description:mail.field_mail_message__moderator_id
 msgid "Moderated By"
-msgstr ""
+msgstr "管理人"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_ids
@@ -3374,7 +3365,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_mail__moderation_status
 #: model:ir.model.fields,field_description:mail.field_mail_message__moderation_status
 msgid "Moderation Status"
-msgstr ""
+msgstr "管理狀態"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_res_users__moderation_counter
@@ -3401,7 +3392,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_base_module_uninstall
 msgid "Module Uninstall"
-msgstr ""
+msgstr "模組卸載"
 
 #. module: mail
 #: selection:ir.actions.server,activity_date_deadline_range_type:0
@@ -3457,7 +3448,7 @@ msgstr "需要採取行動"
 #: model:ir.model.fields,field_description:mail.field_mail_mail__need_moderation
 #: model:ir.model.fields,field_description:mail.field_mail_message__need_moderation
 msgid "Need moderation"
-msgstr ""
+msgstr "需要調節"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
@@ -3735,7 +3726,7 @@ msgstr "需要行動消息的數量"
 #: model:ir.model.fields,help:mail.field_mail_thread__message_has_error_counter
 #: model:ir.model.fields,help:mail.field_res_partner__message_has_error_counter
 msgid "Number of messages with delivery error"
-msgstr "發送錯誤的郵件數"
+msgstr "發送錯誤的信件數"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_blacklist__message_unread_counter
@@ -4036,7 +4027,7 @@ msgstr "需要採取行動的業務夥伴"
 #: selection:mail.compose.message,moderation_status:0
 #: selection:mail.message,moderation_status:0
 msgid "Pending Moderation"
-msgstr ""
+msgstr "待修改"
 
 #. module: mail
 #. openerp-web
@@ -4120,6 +4111,11 @@ msgid "Please contact us instead using"
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "Please find below the guidelines of the"
+msgstr ""
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:544
 #, python-format
@@ -4152,7 +4148,7 @@ msgid ""
 "- partners: only authenticated partners\n"
 "- followers: only followers of the related document or members of following channels\n"
 msgstr ""
-"通過信件網關在文檔上提交一個消息政策。\n"
+"通過信件網關在文件上提交一個消息政策。\n"
 "- 任何人：任何人都可以提交\n"
 "- 合作夥伴：只有認證過的合作夥伴\n"
 "- 跟隨者：只有相關文件或下列頻道成員的跟隨者\n"
@@ -4391,7 +4387,7 @@ msgstr "關係字段"
 #. module: mail
 #: selection:mail.activity.type,category:0
 msgid "Reminder"
-msgstr ""
+msgstr "提醒"
 
 #. module: mail
 #. openerp-web
@@ -4425,7 +4421,7 @@ msgstr "移除此關注者"
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Reply"
-msgstr "回復"
+msgstr "回覆"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_compose_message__reply_to
@@ -4482,7 +4478,7 @@ msgstr "負責"
 #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
 #: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
 msgid "Responsible User"
-msgstr "責任用戶"
+msgstr "責任使用者"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -4515,7 +4511,7 @@ msgstr "SMTP 伺服器"
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview__res_id
 msgid "Sample Document"
-msgstr "示例文檔"
+msgstr "示例文件"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
@@ -4771,7 +4767,7 @@ msgid "Show all records which has next action date is before today"
 msgstr "顯示所有下一個活動日期在今天之前的記錄"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:910
+#: code:addons/mail/models/mail_channel.py:914
 #, python-format
 msgid "Show an helper message"
 msgstr "顯示幫助者信息"
@@ -4968,7 +4964,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model.fields,help:mail.field_ir_actions_server__activity_user_field_name
 msgid "Technical name of the user on the record"
-msgstr ""
+msgstr "記錄上使用者的技術名稱"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.wizard_email_template_preview
@@ -5069,7 +5065,7 @@ msgstr "在聊天消息中，必須替換掉的快捷方式"
 #: 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 "該模板可使用的文檔類型"
+msgstr "該模板可使用的文件類型"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
@@ -5423,7 +5419,7 @@ msgid ""
 "Use 'Specific User' to always assign the same user on the next activity. Use"
 " 'Generic User From Record' to specify the field name of the user to choose "
 "on the record."
-msgstr ""
+msgstr "使用 '特定使用者' 總是在下一個活動中分配相同的使用者。使用 '記錄中的通用使用者' 指定在記錄上選擇的使用者的字段名。 "
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
@@ -5458,7 +5454,7 @@ msgstr "使用者"
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_user_field_name
 msgid "User field name"
-msgstr ""
+msgstr "使用者字段名字"
 
 #. module: mail
 #. openerp-web
@@ -5474,7 +5470,7 @@ msgid "Users"
 msgstr "使用者"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:955
+#: code:addons/mail/models/mail_channel.py:959
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr "在此頻道的使用者 : %s %s 以及您。"
@@ -5530,7 +5526,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/thread.xml:57
 #, python-format
 msgid "Viewer"
-msgstr ""
+msgstr "查看者"
 
 #. module: mail
 #. openerp-web
@@ -5549,7 +5545,7 @@ msgid ""
 " Do you really want to remove this follower ?"
 msgstr ""
 "警告！\n"
-" 如果刪除一個關注者，任何關於此文檔的電子信件或討論都不再向其通知。\n"
+" 如果刪除一個關注者，任何關於此文件的電子信件或討論都不再向其通知。\n"
 " 真的想要刪除這個關注者嗎 ?"
 
 #. module: mail
@@ -5624,7 +5620,7 @@ msgid "You added <b>%s</b> to the conversation."
 msgstr "您添加了 <b>%s</b> 到對話。"
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:952
+#: code:addons/mail/models/mail_channel.py:956
 #, python-format
 msgid "You are alone in this channel."
 msgstr "您是此頻道的唯一人員。"
@@ -5658,13 +5654,13 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/models/mail_channel.py:925
 #, 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:915
+#: code:addons/mail/models/mail_channel.py:919
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr "您在頻道 <b>#%s</b>。"
@@ -5795,14 +5791,14 @@ msgstr "您的模板需要定義email_from"
 #: code:addons/mail/static/src/xml/thread.xml:68
 #, python-format
 msgid "Zoom In"
-msgstr ""
+msgstr "放大"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:70
 #, python-format
 msgid "Zoom Out"
-msgstr ""
+msgstr "縮小"
 
 #. module: mail
 #: selection:mail.activity.type,delay_from:0
@@ -5826,6 +5822,11 @@ msgid "assigned you an activity"
 msgstr ""
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "董事會－會議"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
@@ -5841,6 +5842,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_send_guidelines
+msgid "channel."
+msgstr ""
+
+#. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
 msgid "created"
 msgstr "創建"
@@ -5923,20 +5929,20 @@ msgstr "別名配置錯誤（未知參考記錄）"
 #: code:addons/mail/models/mail_thread.py:1051
 #, python-format
 msgid "model %s does not accept document creation"
-msgstr "模型 %s 不接受文檔創建"
+msgstr "模型 %s 不接受文件創建"
 
 #. module: mail
 #: code:addons/mail/models/mail_thread.py:1046
 #, python-format
 msgid "model %s does not accept document update"
-msgstr "模型 %s 不接受文檔更新"
+msgstr "模型 %s 不接受文件更新"
 
 #. module: mail
 #: code:addons/mail/models/mail_thread.py:1039
 #, python-format
 msgid ""
 "model %s does not accept document update, fall back on document creation"
-msgstr "模型 %s 不接受文檔更新，回退到文檔創建"
+msgstr "模型 %s 不接受文件更新，回退到文件創建"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
@@ -5993,6 +5999,11 @@ msgid ""
 msgstr "發佈無模型消息應使用 parent_id（私人信息）"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "rd"
+
+#. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/thread_widget.js:20
 #, python-format
@@ -6015,13 +6026,13 @@ msgstr "記錄："
 #: code:addons/mail/models/mail_thread.py:1043
 #, python-format
 msgid "reply to missing document (%s,%s)"
-msgstr "回覆缺失文檔 (%s,%s)"
+msgstr "回覆缺失文件 (%s,%s)"
 
 #. module: mail
 #: code:addons/mail/models/mail_thread.py:1036
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
-msgstr "回覆缺失文檔 (%s,%s)，回退到新的文檔創建"
+msgstr "回覆缺失文件 (%s,%s)，回退到新的文件創建"
 
 #. module: mail
 #: code:addons/mail/models/mail_thread.py:1021
@@ -6048,6 +6059,11 @@ msgid "restricted to known authors"
 msgstr "僅限於已知的作者"
 
 #. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "銷售"
+
+#. module: mail
 #: code:addons/mail/models/mail_thread.py:1025
 #: code:addons/mail/models/mail_thread.py:1043
 #: code:addons/mail/models/mail_thread.py:1046