diff --git a/privacy/i18n/privacy.pot b/privacy/i18n/privacy.pot
index bb9d584..078c818 100644
--- a/privacy/i18n/privacy.pot
+++ b/privacy/i18n/privacy.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
@@ -14,7 +14,12 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: privacy
-#: model:ir.model.fields,field_description:privacy.field_privacy_activity_active
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__active
 msgid "Active"
 msgstr ""
 
@@ -25,33 +30,38 @@ msgid "Activities"
 msgstr ""
 
 #. module: privacy
-#: model:ir.ui.view,arch_db:privacy.activity_search
+#: model_terms:ir.ui.view,arch_db:privacy.activity_search
 msgid "Archived"
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,help:privacy.field_privacy_activity_subject_find
+#: model:ir.model.fields,help:privacy.field_privacy_activity__subject_find
 msgid "Are affected subjects present in this database?"
 msgstr ""
 
 #. module: privacy
-#: model:ir.actions.act_window,help:privacy.activity_action
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: privacy
+#: model_terms:ir.actions.act_window,help:privacy.activity_action
 msgid "Click to add a data processing activity."
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,field_description:privacy.field_privacy_activity_controller_id
-#: model:ir.ui.view,arch_db:privacy.activity_search
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__controller_id
+#: model_terms:ir.ui.view,arch_db:privacy.activity_search
 msgid "Controller"
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,field_description:privacy.field_privacy_activity_create_uid
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,field_description:privacy.field_privacy_activity_create_date
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__create_date
 msgid "Created on"
 msgstr ""
 
@@ -81,72 +91,147 @@ msgid "Data processing activities"
 msgstr ""
 
 #. module: privacy
-#: model:ir.actions.act_window,help:privacy.activity_action
+#: model_terms:ir.actions.act_window,help:privacy.activity_action
 msgid "Data processing activities define why, how and what you do\n"
 "                with subjects' personal data."
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,field_description:privacy.field_privacy_activity_subject_find
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__subject_find
 msgid "Define subjects"
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,field_description:privacy.field_privacy_activity_description
-#: model:ir.ui.view,arch_db:privacy.activity_form
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__description
+#: model_terms:ir.ui.view,arch_db:privacy.activity_form
 msgid "Description"
 msgstr ""
 
 #. module: privacy
-#: model:ir.ui.view,arch_db:privacy.activity_form
+#: model_terms:ir.ui.view,arch_db:privacy.activity_form
 msgid "Details"
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,field_description:privacy.field_privacy_activity_display_name
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: privacy
-#: model:ir.ui.view,arch_db:privacy.activity_search
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: privacy
+#: model_terms:ir.ui.view,arch_db:privacy.activity_search
 msgid "Group By"
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,help:privacy.field_privacy_activity_description
+#: model:ir.model.fields,help:privacy.field_privacy_activity__description
 msgid "How is personal data used here? Why? Etc."
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,field_description:privacy.field_privacy_activity_id
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__id
 msgid "ID"
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,field_description:privacy.field_privacy_activity___last_update
+#: model:ir.model.fields,help:privacy.field_privacy_activity__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,help:privacy.field_privacy_activity__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,help:privacy.field_privacy_activity__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,field_description:privacy.field_privacy_activity_write_uid
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,field_description:privacy.field_privacy_activity_write_date
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__write_date
 msgid "Last Updated on"
 msgstr ""
 
+#. module: privacy
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
 #. module: privacy
 #: model:ir.ui.menu,name:privacy.menu_data_protection_master_data
 msgid "Master Data"
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,field_description:privacy.field_privacy_activity_name
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__name
 msgid "Name"
 msgstr ""
 
+#. module: privacy
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,help:privacy.field_privacy_activity__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,help:privacy.field_privacy_activity__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,help:privacy.field_privacy_activity__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
 #. module: privacy
 #: model:ir.actions.act_window,name:privacy.action_data_protection_partner_form
 #: model:ir.ui.menu,name:privacy.menu_data_protection_partner
@@ -159,7 +244,8 @@ msgid "Privacy"
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,field_description:privacy.field_privacy_activity_processor_ids
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__processor_ids
+#: model_terms:ir.ui.view,arch_db:privacy.activity_form
 msgid "Processors"
 msgstr ""
 
@@ -169,7 +255,7 @@ msgid "Reports"
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,help:privacy.field_privacy_activity_subject_domain
+#: model:ir.model.fields,help:privacy.field_privacy_activity__subject_domain
 msgid "Selection filter to find specific subjects included."
 msgstr ""
 
@@ -179,7 +265,12 @@ msgid "Settings"
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,field_description:privacy.field_privacy_activity_subject_domain
+#: model_terms:ir.ui.view,arch_db:privacy.activity_form
+msgid "Subjects details"
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__subject_domain
 msgid "Subjects filter"
 msgstr ""
 
@@ -189,12 +280,27 @@ msgid "Transactions"
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,help:privacy.field_privacy_activity_controller_id
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,field_description:privacy.field_privacy_activity__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: privacy
+#: model:ir.model.fields,help:privacy.field_privacy_activity__controller_id
 msgid "Whoever determines the purposes and means of the processing of personal data."
 msgstr ""
 
 #. module: privacy
-#: model:ir.model.fields,help:privacy.field_privacy_activity_processor_ids
+#: model:ir.model.fields,help:privacy.field_privacy_activity__processor_ids
 msgid "Whoever processes personal data on behalf of the controller."
 msgstr ""
 
+#. module: privacy
+#: model_terms:ir.ui.view,arch_db:privacy.activity_form
+msgid "processors"
+msgstr ""
+