From d4eebd7f22be2ae9be08d8b8b5cf9a645edd5020 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 6 Apr 2016 08:29:00 +0200
Subject: [PATCH] [FIX] mail: fix translation

Missing translations and typo.

Closes #11604
opw-673853
---
 addons/mail/i18n/mail.pot            | 30 ++++++++++++++++++++++++++--
 addons/mail/static/src/js/chatter.js |  2 +-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index 7cad15e30fb..2bae42c7320 100644
--- a/addons/mail/i18n/mail.pot
+++ b/addons/mail/i18n/mail.pot
@@ -1660,8 +1660,10 @@ msgid "Listeners"
 msgstr ""
 
 #. module: mail
-#: selection:mail.channel,channel_type:0
-msgid "Livechat Conversation"
+#. openerp-web
+#: code:addons/mail/static/src/js/chatter.js:443
+#, python-format
+msgid "Log"
 msgstr ""
 
 #. module: mail
@@ -1801,6 +1803,13 @@ msgstr ""
 msgid "Message references, such as identifiers of previous messages"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:122
+#, python-format
+msgid "Message sent in \""
+msgstr ""
+
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_message_subtype_name
 msgid "Message subtype gives a more precise type on the message, especially for system notifications. For example, it can be a notification related to a new record (New), or to a stage change in a process (Stage change). Message subtypes allow to precisely tune the notifications the user want to receive on its wall."
@@ -2499,7 +2508,10 @@ msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:105
 #: model:ir.ui.view,arch_db:mail.view_mail_form
+#, python-format
 msgid "Reply"
 msgstr ""
 
@@ -2636,6 +2648,13 @@ msgstr ""
 msgid "Send a message"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:135
+#, python-format
+msgid "Send mail"
+msgstr ""
+
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
 msgid "Send messages by email"
@@ -3313,6 +3332,13 @@ msgstr ""
 msgid "mycompany.odoo.com"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:142
+#, python-format
+msgid "now"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:93
diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js
index 5d5b5be089d..d57deed0802 100644
--- a/addons/mail/static/src/js/chatter.js
+++ b/addons/mail/static/src/js/chatter.js
@@ -440,7 +440,7 @@ var ChatterComposer = composer.BasicComposer.extend({
             internal_subtypes: [],
         });
         if (this.options.is_log) {
-            this.options.send_text = _('Log');
+            this.options.send_text = _t('Log');
         }
         this.events = _.extend(this.events, {
             'click .o_composer_button_full_composer': 'on_open_full_composer',