[MERGE] forward port branch saas-12.4 up to 98a55917a60

1 files changed, 20 insertions, 16 deletions

diff --git a/addons/website_mail/i18n/website_mail.pot b/addons/website_mail/i18n/website_mail.pot
index 774b37d5c28..7dfbdf2236c 100644
--- a/addons/website_mail/i18n/website_mail.pot
+++ b/addons/website_mail/i18n/website_mail.pot
@@ -1,14 +1,14 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* website_mail
+# 	* website_mail
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server saas~12.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2019-08-12 11:32+0000\n"
+"PO-Revision-Date: 2019-08-12 11:32+0000\n"
+"Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,8 +16,6 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. 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
 msgid "Description"
@@ -34,8 +32,6 @@ 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
 msgid "Message description: either the subject, or the beginning of the body"
@@ -44,8 +40,6 @@ 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
 #, python-format
@@ -58,14 +52,21 @@ msgid "Publisher Warranty Contract"
 msgstr ""
 
 #. module: website_mail
+#: code:addons/website_mail/models/mail_message.py:64
+#, python-format
+msgid "Records:"
+msgstr ""
+
+#. module: website_mail
 #: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr ""
 
 #. module: website_mail
-#: code:addons/website_mail/models/mail_message.py:57
+#: code:addons/website_mail/models/mail_message.py:63
 #, python-format
-msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
+msgid ""
+"The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
 "\n"
 "(Document type: %s, Operation: %s)"
 msgstr ""
@@ -83,8 +84,12 @@ 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
+#: code:addons/website_mail/models/mail_message.py:64
+#, python-format
+msgid "User:"
+msgstr ""
+
+#. module: website_mail
 #: model:ir.model.fields,help:website_mail.field_mail_mail__website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message__website_published
 msgid "Visible on the website as a comment"
@@ -94,4 +99,3 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr ""
-