[I18N] Update translation terms from Transifex

24 files changed, 273 insertions, 2570 deletions

diff --git a/addons/website_mail/i18n/ar.po b/addons/website_mail/i18n/ar.po
index 818304fa244..7a819479a6a 100644
--- a/addons/website_mail/i18n/ar.po
+++ b/addons/website_mail/i18n/ar.po
@@ -10,10 +10,10 @@
 # Shaima Safar <shaima.safar@open-inside.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
 "Last-Translator: Shaima Safar <shaima.safar@open-inside.com>, 2018\n"
 "Language-Team: Arabic (https://www.transifex.com/odoo/teams/41243/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -23,97 +23,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: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -132,6 +42,7 @@ msgid "Message"
 msgstr "الرسالة"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -142,6 +53,7 @@ msgstr ""
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -151,7 +63,7 @@ msgid "Published"
 msgstr "منشور"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "اشتراك"
 
@@ -175,11 +87,12 @@ msgid "Unpublished"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "إلغاء الاشتراك"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -188,16 +101,11 @@ msgid "Visible on the website as a comment"
 msgstr "ظاهر على الموقع كتعليق"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr ""
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "بريدك الإلكتروني..."
diff --git a/addons/website_mail/i18n/cs.po b/addons/website_mail/i18n/cs.po
index 8918d1995fb..e13296258d4 100644
--- a/addons/website_mail/i18n/cs.po
+++ b/addons/website_mail/i18n/cs.po
@@ -7,10 +7,10 @@
 # trendspotter, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
 "Last-Translator: trendspotter, 2018\n"
 "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -20,97 +20,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: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -129,6 +39,7 @@ msgid "Message"
 msgstr "Zpráva"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -139,6 +50,7 @@ msgstr "Popis zprávy: buď předmět, nebo začátek těla zprávy"
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -148,7 +60,7 @@ msgid "Published"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "Upsat se"
 
@@ -172,11 +84,12 @@ msgid "Unpublished"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr ""
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -185,16 +98,11 @@ msgid "Visible on the website as a comment"
 msgstr ""
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr ""
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "publisher_warranty.contract"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr ""
diff --git a/addons/website_mail/i18n/de.po b/addons/website_mail/i18n/de.po
index a865302efd1..d8987db7261 100644
--- a/addons/website_mail/i18n/de.po
+++ b/addons/website_mail/i18n/de.po
@@ -3,20 +3,17 @@
 # * website_mail
 # 
 # Translators:
-# Martin Trigaux, 2017
-# darenkster <inactive+darenkster@transifex.com>, 2017
-# Wolfgang Taferner, 2017
-# Renzo Meister, 2017
-# Ermin Trevisan <trevi@twanda.com>, 2017
-# Andi, 2017
-# e2f <projects@e2f.com>, 2018
+# Martin Trigaux, 2018
+# Wolfgang Taferner, 2018
+# Ermin Trevisan <trevi@twanda.com>, 2018
+# Andi, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: e2f <projects@e2f.com>, 2018\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
+"Last-Translator: Andi, 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"
@@ -25,97 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -134,6 +41,7 @@ msgid "Message"
 msgstr "Nachricht"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -146,6 +54,7 @@ msgstr ""
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -155,7 +64,7 @@ msgid "Published"
 msgstr "Veröffentlicht"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "Abonnieren"
 
@@ -179,11 +88,12 @@ msgid "Unpublished"
 msgstr "Unveröffentlicht"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "Abmelden"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -192,16 +102,11 @@ msgid "Visible on the website as a comment"
 msgstr "In der Website als Kommentar sichtbar"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr "Ihr Unternehmen ist jederzeit von überall aus erreichbar!"
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "publisher_warranty.contract"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "Ihre E-Mail..."
diff --git a/addons/website_mail/i18n/el.po b/addons/website_mail/i18n/el.po
index e004b0b2c0f..51a98398d5c 100644
--- a/addons/website_mail/i18n/el.po
+++ b/addons/website_mail/i18n/el.po
@@ -6,10 +6,10 @@
 # Martin Trigaux, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
 "Last-Translator: Martin Trigaux, 2018\n"
 "Language-Team: Greek (https://www.transifex.com/odoo/teams/41243/el/)\n"
 "MIME-Version: 1.0\n"
@@ -19,97 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -128,6 +38,7 @@ msgid "Message"
 msgstr "Μήνυμα"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -138,6 +49,7 @@ msgstr ""
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -147,7 +59,7 @@ msgid "Published"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr ""
 
@@ -171,11 +83,12 @@ msgid "Unpublished"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr ""
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -184,16 +97,11 @@ msgid "Visible on the website as a comment"
 msgstr ""
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr ""
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr ""
diff --git a/addons/website_mail/i18n/es.po b/addons/website_mail/i18n/es.po
index 8918fc2159d..9b9f7951caf 100644
--- a/addons/website_mail/i18n/es.po
+++ b/addons/website_mail/i18n/es.po
@@ -9,10 +9,10 @@
 # Nicolás Broggi <rnbroggi@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
 "Last-Translator: Nicolás Broggi <rnbroggi@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
@@ -22,97 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -131,6 +41,7 @@ msgid "Message"
 msgstr "Mensaje"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -143,6 +54,7 @@ msgstr ""
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -152,7 +64,7 @@ msgid "Published"
 msgstr "Publicado"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "Suscribirse"
 
@@ -176,11 +88,12 @@ msgid "Unpublished"
 msgstr "No publicado"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "Anular subscripción"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -189,16 +102,11 @@ msgid "Visible on the website as a comment"
 msgstr "Visible en el sitio web como un comentario"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr "¡Su negocio es accesible desde cualquier parte, en cualquier momento!"
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "Contrato de garantía del publicador"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "su correo electrónico..."
diff --git a/addons/website_mail/i18n/fa.po b/addons/website_mail/i18n/fa.po
index a32d59420f6..1e3071d2e37 100644
--- a/addons/website_mail/i18n/fa.po
+++ b/addons/website_mail/i18n/fa.po
@@ -9,10 +9,10 @@
 # Hamed Mohammadi <hamed@dehongi.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
 "Last-Translator: Hamed Mohammadi <hamed@dehongi.com>, 2018\n"
 "Language-Team: Persian (https://www.transifex.com/odoo/teams/41243/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -22,97 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -131,6 +41,7 @@ msgid "Message"
 msgstr "پیام"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -141,6 +52,7 @@ msgstr ""
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -150,7 +62,7 @@ msgid "Published"
 msgstr "منتشر شده"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "عضویت"
 
@@ -171,11 +83,12 @@ msgid "Unpublished"
 msgstr "منتشر نشده"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr ""
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -184,16 +97,11 @@ msgid "Visible on the website as a comment"
 msgstr "قابل دید در وبسایت به عنوان کامنت"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr ""
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr ""
diff --git a/addons/website_mail/i18n/fi.po b/addons/website_mail/i18n/fi.po
index 1403409cc5b..28b223a99c6 100644
--- a/addons/website_mail/i18n/fi.po
+++ b/addons/website_mail/i18n/fi.po
@@ -11,10 +11,10 @@
 # Veikko Väätäjä <veikko.vaataja@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
 "Last-Translator: Veikko Väätäjä <veikko.vaataja@gmail.com>, 2018\n"
 "Language-Team: Finnish (https://www.transifex.com/odoo/teams/41243/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -24,97 +24,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -133,6 +43,7 @@ msgid "Message"
 msgstr "Viesti"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -143,6 +54,7 @@ msgstr "Viestin kuvaus: joko aihe tai varsinaisen viestin alku"
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -152,7 +64,7 @@ msgid "Published"
 msgstr "Julkaistu"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "Tilaa"
 
@@ -176,11 +88,12 @@ msgid "Unpublished"
 msgstr "Julkaisematon"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "Lopeta kanavan tilaus"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -189,16 +102,11 @@ msgid "Visible on the website as a comment"
 msgstr "Näkyvillä verkkosivustolla kommenttina"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr "Yrityksesi on tavoitettavissa aina ja kaikkialta!"
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "publisher_warranty.contract"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "sähköpostisi..."
diff --git a/addons/website_mail/i18n/fr.po b/addons/website_mail/i18n/fr.po
index 7570dfb999b..a41b8a2d472 100644
--- a/addons/website_mail/i18n/fr.po
+++ b/addons/website_mail/i18n/fr.po
@@ -7,14 +7,13 @@
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2018
 # Richard Mathot <rim@odoo.com>, 2018
 # Shark McGnark <peculiarcheese@gmail.com>, 2018
-# Eloïse Stilmant <est@odoo.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: Eloïse Stilmant <est@odoo.com>, 2018\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
+"Last-Translator: Shark McGnark <peculiarcheese@gmail.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"
@@ -23,183 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Connexion</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Super!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Votre site web est maintenant en ligne!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Le saviez-vous?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Du menu Applications, vous pouvez installer de nouvelles fonctionnalités (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Personnaliser votre site web via le menu Personnaliser de votre app.\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Augmentez votre traffic en optimisant votre référencement grâce à notre outil SEO,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Améliorez votre taux de conversion du visiteur au client avec le support en live,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Elargissez votre audience avec un site multilingue,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Allez plus loin dans la personnalisation grâce à notre éditeur HTML,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Et bien plus...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Besoin d'aide?</span>\n"
-"                                <span style=\"font-style:italic;\">Vous n'êtes pas seul!</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>Nous serons ravis de vous accompagner. Contactez-nous au moyen de notre\n"
-"                                <a href=\"https://www.odoo.com/help\">formulaire de support</a> pour toutes questions.\n"
-"                                Vous pouvez aussi découvrir comment tirer le meilleur d'Odoo via notre </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">Documentation utilisateur</span></a>\n"
-"                                </span><span> ou notre </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">Documentation API</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Bonne expérience avec Odoo,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>La Team Odoo<br/>PS: Les gens adorent Odoo, regardez </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">ce qu'ils en disent.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -218,6 +41,7 @@ msgid "Message"
 msgstr "Message"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -230,6 +54,7 @@ msgstr ""
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -239,7 +64,7 @@ msgid "Published"
 msgstr "Publié"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "S'inscrire"
 
@@ -263,11 +88,12 @@ msgid "Unpublished"
 msgstr "Non publié"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "Se désabonner"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -276,16 +102,11 @@ msgid "Visible on the website as a comment"
 msgstr "Visible sur le site web comme commentaire"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr "Votre entreprise est disponible partout, tout le temps !"
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "publisher_warranty.contract"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "Votre adresse email..."
diff --git a/addons/website_mail/i18n/gu.po b/addons/website_mail/i18n/gu.po
index 07646aec767..aa81af1f35b 100644
--- a/addons/website_mail/i18n/gu.po
+++ b/addons/website_mail/i18n/gu.po
@@ -7,10 +7,10 @@
 # Ranjit Pillai <rpi@odoo.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
 "Last-Translator: Ranjit Pillai <rpi@odoo.com>, 2018\n"
 "Language-Team: Gujarati (https://www.transifex.com/odoo/teams/41243/gu/)\n"
 "MIME-Version: 1.0\n"
@@ -20,97 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -129,6 +39,7 @@ msgid "Message"
 msgstr "સંદેશ"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -139,6 +50,7 @@ msgstr ""
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -148,7 +60,7 @@ msgid "Published"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "ઉમેદવારી નોંધાવો"
 
@@ -169,11 +81,12 @@ msgid "Unpublished"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr ""
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -182,16 +95,11 @@ msgid "Visible on the website as a comment"
 msgstr ""
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr ""
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr ""
diff --git a/addons/website_mail/i18n/it.po b/addons/website_mail/i18n/it.po
index bc6655d909e..c1ed06120f1 100644
--- a/addons/website_mail/i18n/it.po
+++ b/addons/website_mail/i18n/it.po
@@ -8,10 +8,10 @@
 # Paolo Valier, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
 "Last-Translator: Paolo Valier, 2018\n"
 "Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n"
 "MIME-Version: 1.0\n"
@@ -21,97 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -130,6 +40,7 @@ msgid "Message"
 msgstr "Messaggio"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -142,6 +53,7 @@ msgstr ""
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -151,7 +63,7 @@ msgid "Published"
 msgstr "Pubblicato"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "Iscriviti"
 
@@ -175,11 +87,12 @@ msgid "Unpublished"
 msgstr "Non pubblicato"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "Annulla iscrizione"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -188,17 +101,11 @@ msgid "Visible on the website as a comment"
 msgstr "Visibile sul sito come commento"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr ""
-"La tua azienda è raggiungibile da qualsiasi luogo, in qualsiasi momento!"
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "publisher_warranty.contract"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "la tua email..."
diff --git a/addons/website_mail/i18n/km.po b/addons/website_mail/i18n/km.po
index 5f121bd2e52..9e7832ad591 100644
--- a/addons/website_mail/i18n/km.po
+++ b/addons/website_mail/i18n/km.po
@@ -4,10 +4,10 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
 "Language-Team: Khmer (https://www.transifex.com/odoo/teams/41243/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,97 +16,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -125,6 +35,7 @@ msgid "Message"
 msgstr ""
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -135,6 +46,7 @@ msgstr ""
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -144,7 +56,7 @@ msgid "Published"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr ""
 
@@ -165,11 +77,12 @@ msgid "Unpublished"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr ""
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -178,16 +91,11 @@ msgid "Visible on the website as a comment"
 msgstr ""
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr ""
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr ""
diff --git a/addons/website_mail/i18n/mn.po b/addons/website_mail/i18n/mn.po
index 69822c36076..40c1d49fdb6 100644
--- a/addons/website_mail/i18n/mn.po
+++ b/addons/website_mail/i18n/mn.po
@@ -3,17 +3,16 @@
 # * website_mail
 # 
 # Translators:
+# Martin Trigaux, 2018
 # Otgonbayar.A <gobi.mn@gmail.com>, 2018
-# Batzul B <batzul.active@gmail.com>, 2018
 # Khishigbat Ganbold <khishigbat@asterisk-tech.mn>, 2018
-# Onii Onii <onii0223@yahoo.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: Onii Onii <onii0223@yahoo.com>, 2018\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
+"Last-Translator: Khishigbat Ganbold <khishigbat@asterisk-tech.mn>, 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"
@@ -22,97 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -131,6 +40,7 @@ msgid "Message"
 msgstr "Зурвас"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -141,6 +51,7 @@ msgstr "Зурвасын тодорхойлолт: гарчиг эсвэл би�
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -150,7 +61,7 @@ msgid "Published"
 msgstr "Нийтлэгдсэн"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "Бүртгүүлэх"
 
@@ -174,11 +85,12 @@ msgid "Unpublished"
 msgstr "Нийтлэгдээгүй"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "Бүртгэл цуцлах"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -187,16 +99,11 @@ msgid "Visible on the website as a comment"
 msgstr "Вебсайт дээр сэтгэгдэл болж үзэгдэх"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr "Таны бизнест хаанаас ч, хэдийд ч хүрэх боломжтой !"
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "publisher_warranty.contract"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "таны имэйл..."
diff --git a/addons/website_mail/i18n/nb.po b/addons/website_mail/i18n/nb.po
index 39951b16ede..dd2b799d041 100644
--- a/addons/website_mail/i18n/nb.po
+++ b/addons/website_mail/i18n/nb.po
@@ -7,10 +7,10 @@
 # Jorunn D. Newth, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09: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,97 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -129,6 +39,7 @@ msgid "Message"
 msgstr "Melding"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -140,6 +51,7 @@ msgstr ""
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -149,7 +61,7 @@ msgid "Published"
 msgstr "Publisert"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "Abonner"
 
@@ -173,11 +85,12 @@ msgid "Unpublished"
 msgstr "Upublisert"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "Avmeld"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -186,16 +99,11 @@ msgid "Visible on the website as a comment"
 msgstr "Synlig som kommentar på nettstedet"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr "Firmaet ditt kan nås når som helst fra hvor som helst!"
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "publisher_warranty.contract"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "din epost..."
diff --git a/addons/website_mail/i18n/nl.po b/addons/website_mail/i18n/nl.po
index a87ad0e6233..ce6bd8f593e 100644
--- a/addons/website_mail/i18n/nl.po
+++ b/addons/website_mail/i18n/nl.po
@@ -4,14 +4,13 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
-# Erwin van der Ploeg <erwin@odooexperts.nl>, 2018
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
 "Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,97 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -130,6 +39,7 @@ msgid "Message"
 msgstr "Bericht"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -140,6 +50,7 @@ msgstr "Bericht omschrijving: of het onderwerp, of het begin van de body"
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -149,7 +60,7 @@ msgid "Published"
 msgstr "Gepubliceerd"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "Inschrijven"
 
@@ -173,11 +84,12 @@ msgid "Unpublished"
 msgstr "Niet gepubliceerd"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "Uitschrijven"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -186,16 +98,11 @@ msgid "Visible on the website as a comment"
 msgstr "Zichtbaar op de website als commentaar"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr "U bedrijf is van overal bereikbaar,  altijd!"
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "publisher_warranty.contract"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "uw e-mail..."
diff --git a/addons/website_mail/i18n/pl.po b/addons/website_mail/i18n/pl.po
index 6b2e9b308f6..838d1173ea9 100644
--- a/addons/website_mail/i18n/pl.po
+++ b/addons/website_mail/i18n/pl.po
@@ -4,10 +4,10 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
 "Language-Team: Polish (https://www.transifex.com/odoo/teams/41243/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,97 +16,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: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -125,6 +35,7 @@ msgid "Message"
 msgstr ""
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -135,6 +46,7 @@ msgstr ""
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -144,7 +56,7 @@ msgid "Published"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr ""
 
@@ -165,11 +77,12 @@ msgid "Unpublished"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr ""
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -178,16 +91,11 @@ msgid "Visible on the website as a comment"
 msgstr ""
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr ""
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr ""
diff --git a/addons/website_mail/i18n/pt_BR.po b/addons/website_mail/i18n/pt_BR.po
index 106cda25814..1edbc0afe8a 100644
--- a/addons/website_mail/i18n/pt_BR.po
+++ b/addons/website_mail/i18n/pt_BR.po
@@ -3,21 +3,20 @@
 # * website_mail
 # 
 # Translators:
-# Martin Trigaux, 2016
-# Luiz Carlos de Lima <luiz.carlos@akretion.com.br>, 2016
-# grazziano <gra.negocia@gmail.com>, 2016
-# Rui Andrada <shingonoide@gmail.com>, 2016
-# Mateus Lopes <mateus1@gmail.com>, 2016
-# Clemilton Clementino <clemylton@hotmail.com>, 2016
-# Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2016
-# Silmar <pinheirosilmar@gmail.com>, 2017
+# Rui Andrada <shingonoide@gmail.com>, 2018
+# Martin Trigaux, 2018
+# Clemilton Clementino <clemylton@hotmail.com>, 2018
+# Mateus Lopes <mateus1@gmail.com>, 2018
+# Luiz Carlos de Lima <luiz.carlos@akretion.com.br>, 2018
+# grazziano <gra.negocia@gmail.com>, 2018
+# Silmar <pinheirosilmar@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: Silmar <pinheirosilmar@gmail.com>, 2017\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
+"Last-Translator: Silmar <pinheirosilmar@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"
@@ -26,97 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -135,6 +44,7 @@ msgid "Message"
 msgstr "Mensagem"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -145,6 +55,7 @@ msgstr "Descrição da mensagem: ou o assunto, ou o início do corpo"
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -154,7 +65,7 @@ msgid "Published"
 msgstr "Publicado"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "Inscrever"
 
@@ -177,11 +88,12 @@ msgid "Unpublished"
 msgstr "Não publicado"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "Cancelar a inscrição"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -190,16 +102,11 @@ msgid "Visible on the website as a comment"
 msgstr "Visível no site como um comentário"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr "Sua empresa é acessível a partir de qualquer lugar, a qualquer hora!"
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "Contrato de Serviço"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "seu e-mail..."
diff --git a/addons/website_mail/i18n/ro.po b/addons/website_mail/i18n/ro.po
index 454593ed9e4..9df3e44967c 100644
--- a/addons/website_mail/i18n/ro.po
+++ b/addons/website_mail/i18n/ro.po
@@ -8,10 +8,10 @@
 # Cozmin Candea <office@terrabit.ro>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09: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,97 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -130,6 +40,7 @@ msgid "Message"
 msgstr "Mesaj"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -140,6 +51,7 @@ msgstr ""
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -149,7 +61,7 @@ msgid "Published"
 msgstr "Publicat"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "Abonare"
 
@@ -173,11 +85,12 @@ msgid "Unpublished"
 msgstr "Nepublicat"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "Dezabonare"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -186,16 +99,11 @@ msgid "Visible on the website as a comment"
 msgstr ""
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr ""
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "publisher_warranty.contract"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "emailul dvs...."
diff --git a/addons/website_mail/i18n/ru.po b/addons/website_mail/i18n/ru.po
index d552aee650d..0c2373057e6 100644
--- a/addons/website_mail/i18n/ru.po
+++ b/addons/website_mail/i18n/ru.po
@@ -3,18 +3,16 @@
 # * website_mail
 # 
 # Translators:
-# Martin Trigaux, 2017
-# Masha Koc <mariya.kos.ua@gmail.com>, 2017
-# Sergey Vilizhanin, 2017
-# Collex100, 2017
-# Vladimir Lukianov <lvm.mobile@gmail.com>, 2017
+# Martin Trigaux, 2018
+# Collex100, 2018
+# Vladimir Lukianov <lvm.mobile@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: Vladimir Lukianov <lvm.mobile@gmail.com>, 2017\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
+"Last-Translator: Vladimir Lukianov <lvm.mobile@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"
@@ -23,97 +21,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: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -132,6 +40,7 @@ msgid "Message"
 msgstr "Сообщение"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -142,6 +51,7 @@ msgstr "Описание сообщения: либо тема, либо нач�
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -151,7 +61,7 @@ msgid "Published"
 msgstr "Опубликовано"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "Подписаться"
 
@@ -175,11 +85,12 @@ msgid "Unpublished"
 msgstr "Неопубликованный"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -188,16 +99,11 @@ msgid "Visible on the website as a comment"
 msgstr "Видят на сайте как комментарий"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr "К вашему бизнесу можно добраться из любого места, в любое время!"
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "publisher_warranty.contract"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "ваш электронный адрес..."
diff --git a/addons/website_mail/i18n/sr.po b/addons/website_mail/i18n/sr.po
index 2b92b6ebcbb..481b80b314f 100644
--- a/addons/website_mail/i18n/sr.po
+++ b/addons/website_mail/i18n/sr.po
@@ -4,10 +4,10 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
 "Language-Team: Serbian (https://www.transifex.com/odoo/teams/41243/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,97 +16,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: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -125,6 +35,7 @@ msgid "Message"
 msgstr ""
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -135,6 +46,7 @@ msgstr ""
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -144,7 +56,7 @@ msgid "Published"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr ""
 
@@ -165,11 +77,12 @@ msgid "Unpublished"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr ""
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -178,16 +91,11 @@ msgid "Visible on the website as a comment"
 msgstr ""
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr ""
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr ""
diff --git a/addons/website_mail/i18n/tr.po b/addons/website_mail/i18n/tr.po
index 3b3f7ae4296..0e80ed89e87 100644
--- a/addons/website_mail/i18n/tr.po
+++ b/addons/website_mail/i18n/tr.po
@@ -7,14 +7,13 @@
 # Martin Trigaux, 2018
 # Murat Kaplan <muratk@projetgrup.com>, 2018
 # Saban Yildiz <sabany@projetgrup.com>, 2018
-# Umur Akın <umura@projetgrup.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: Umur Akın <umura@projetgrup.com>, 2018\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
+"Last-Translator: Saban Yildiz <sabany@projetgrup.com>, 2018\n"
 "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,97 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -132,6 +41,7 @@ msgid "Message"
 msgstr "Mesaj"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -142,6 +52,7 @@ msgstr "Mesaj tanımı: konu ya da, gövdenin başlangıcı"
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -151,7 +62,7 @@ msgid "Published"
 msgstr "Yayınlandı"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "Abone Ol"
 
@@ -175,11 +86,12 @@ msgid "Unpublished"
 msgstr "Yayında Değil"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "Üyelikten Çık"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -188,16 +100,11 @@ msgid "Visible on the website as a comment"
 msgstr "Web sitesinde bir yorum olarak görünür"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr "İşiniz nerede, ne zaman olursanız olun her zaman ulaşılabilirdir !"
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "publisher_warranty.contract"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "E-posta adresiniz..."
diff --git a/addons/website_mail/i18n/uk.po b/addons/website_mail/i18n/uk.po
index c6fdf222836..8a066dfce94 100644
--- a/addons/website_mail/i18n/uk.po
+++ b/addons/website_mail/i18n/uk.po
@@ -3,16 +3,17 @@
 # * website_mail
 # 
 # Translators:
+# Martin Trigaux, 2018
 # Bohdan Lisnenko, 2018
 # ТАрас <tratatuta@i.ua>, 2018
-# Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,97 +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: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -130,6 +41,7 @@ msgid "Message"
 msgstr "Повідомлення"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -140,6 +52,7 @@ msgstr "Опис повідомлення: тема або початок тіл
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -149,7 +62,7 @@ msgid "Published"
 msgstr "Опубліковано"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "Підписатися"
 
@@ -173,11 +86,12 @@ msgid "Unpublished"
 msgstr "Неопубліковано"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "Відписатися"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -186,16 +100,11 @@ msgid "Visible on the website as a comment"
 msgstr "Показано на сайті як коментар"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr "Ваш бізнес доступний будь-де, будь-коли!"
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "publisher_warranty.contract"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "Ваш email..."
diff --git a/addons/website_mail/i18n/vi.po b/addons/website_mail/i18n/vi.po
index 1add17e8825..e83bc2e4f03 100644
--- a/addons/website_mail/i18n/vi.po
+++ b/addons/website_mail/i18n/vi.po
@@ -2,12 +2,15 @@
 # This file contains the translation of the following modules:
 # * website_mail
 # 
+# Translators:
+# thanh nguyen <thanhnguyen.icsc@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
+"Last-Translator: thanh nguyen <thanhnguyen.icsc@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"
@@ -16,103 +19,13 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
 #: model:ir.model.fields,field_description:website_mail.field_survey_mail_compose_message__description
 msgid "Description"
-msgstr ""
+msgstr "Miêu tả"
 
 #. module: website_mail
 #: model:mail.channel,name:website_mail.channel_public
@@ -122,9 +35,10 @@ msgstr ""
 #. module: website_mail
 #: model:ir.model,name:website_mail.model_mail_message
 msgid "Message"
-msgstr ""
+msgstr "Thông điệp"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -135,6 +49,7 @@ msgstr ""
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -144,7 +59,7 @@ msgid "Published"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr ""
 
@@ -156,6 +71,9 @@ msgid ""
 "\n"
 "(Document type: %s, Operation: %s)"
 msgstr ""
+"Không thể hoàn tất thao tác được yêu cầu do hạn chế về bảo mật. Xin vui lòng liên hệ với quản trị hệ thống của bạn.\n"
+"\n"
+"(Loại dữ liệu: %s, Hoạt động: %s)"
 
 #. module: website_mail
 #. openerp-web
@@ -165,11 +83,12 @@ msgid "Unpublished"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr ""
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -178,16 +97,11 @@ msgid "Visible on the website as a comment"
 msgstr ""
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr ""
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr ""
diff --git a/addons/website_mail/i18n/zh_CN.po b/addons/website_mail/i18n/zh_CN.po
index 1fd048ac728..23a894c8d1b 100644
--- a/addons/website_mail/i18n/zh_CN.po
+++ b/addons/website_mail/i18n/zh_CN.po
@@ -9,10 +9,10 @@
 # e2f_cn c5 <jarvisn@ecinnovations.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
 "Last-Translator: e2f_cn c5 <jarvisn@ecinnovations.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -22,97 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -131,6 +41,7 @@ msgid "Message"
 msgstr "消息"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -141,6 +52,7 @@ msgstr "消息描述：主题或正文的开始部分"
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -150,7 +62,7 @@ msgid "Published"
 msgstr "已发布"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "订阅"
 
@@ -174,11 +86,12 @@ msgid "Unpublished"
 msgstr "未发布"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "退订"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -187,16 +100,11 @@ msgid "Visible on the website as a comment"
 msgstr "作为评论在网站可见"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr "您的业务可以随时随地处理！"
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "publisher_warranty.contract"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "您的电子邮件..."
diff --git a/addons/website_mail/i18n/zh_TW.po b/addons/website_mail/i18n/zh_TW.po
index cd020d85124..5d99dc76924 100644
--- a/addons/website_mail/i18n/zh_TW.po
+++ b/addons/website_mail/i18n/zh_TW.po
@@ -3,13 +3,14 @@
 # * website_mail
 # 
 # Translators:
+# Martin Trigaux, 2018
 # 敬雲 林 <chingyun@yuanchih-consult.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
 "Last-Translator: 敬雲 林 <chingyun@yuanchih-consult.com>, 2018\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/odoo/teams/41243/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -19,97 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: website_mail
-#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
-msgid ""
-"\n"
-"            <div style=\"margin: 10px auto;\">\n"
-"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:2px;width:30%;\">\n"
-"                            <img src=\"web/static/src/img/logo.png\"/>\n"
-"                        </td>\n"
-"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-"                            <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-"                <tbody>\n"
-"                    <tr>\n"
-"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
-"                            <p style=\"color:#875A7B;margin:0\" >Awesome!</p><br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                <span>Your website is now online!</span></p><br>\n"
-"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>Customize the look of your website with the Customize menu.</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul> <br>\n"
-"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Grow your traffic by optimizing your referencing with our SEO tool,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Broaden your audience with the multi-language support,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-"                                        <span>Go further into the customization with our advanced HTML editor,</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                                <li dir=\"ltr\">\n"
-"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                        <span>And much more...</span>\n"
-"                                    </p>\n"
-"                                </li>\n"
-"                            </ul>\n"
-"                            <br>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span style=\"font-weight:bold;\">Need Help?</span>\n"
-"                                <span style=\"font-style:italic;\">You’re not alone</span>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-"                                <span>We would be delighted to assist you along the way. Contact us through our\n"
-"                                <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-"                                You can also discover how to get the best out of Odoo with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation/user\">\n"
-"                                <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-"                                </span><span> or with our </span>\n"
-"                                <a href=\"https://www.odoo.com/documentation\">\n"
-"                                <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-"                            </p>\n"
-"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-"                        </td>\n"
-"                    </tr>\n"
-"                </tbody>\n"
-"            </table>\n"
-"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-"                <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-"            </div>\n"
-"        </div>"
-msgstr ""
-
-#. module: website_mail
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__description
@@ -128,6 +39,7 @@ msgid "Message"
 msgstr "消息"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__description
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__description
 #: model:ir.model.fields,help:website_mail.field_mail_mail__description
 #: model:ir.model.fields,help:website_mail.field_mail_message__description
@@ -138,6 +50,7 @@ msgstr "消息描述：主題或正文的開始部分"
 #. module: website_mail
 #. openerp-web
 #: code:addons/website_mail/static/src/xml/website_mail.xml:7
+#: model:ir.model.fields,field_description:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message__website_published
@@ -147,7 +60,7 @@ msgid "Published"
 msgstr "已發佈"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr "訂閱"
 
@@ -171,11 +84,12 @@ msgid "Unpublished"
 msgstr "未發佈"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr "退訂"
 
 #. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_account_invoice_send__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
@@ -184,16 +98,11 @@ msgid "Visible on the website as a comment"
 msgstr "作為評論在網站可見"
 
 #. module: website_mail
-#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
-msgid "Your business is reachable from anywhere, anytime !"
-msgstr "您的業務可以隨時隨地處理！"
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr "publisher_warranty.contract"
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.follow
+#: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr "您的電子信件..."