8 files changed, 518 insertions, 54 deletions
diff --git a/addons/website_mail_channel/controllers/main.py b/addons/website_mail_channel/controllers/main.py
index 6661ecd14b1..01d55c7b75a 100644
--- a/addons/website_mail_channel/controllers/main.py
+++ b/addons/website_mail_channel/controllers/main.py
@@ -117,7 +117,7 @@ class MailGroup(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
         thread_obj = request.registry.get('mail.message')
 
-        domain = [('model', '=', 'mail.channel'), ('res_id', '=', group.id)]
+        domain = [('model', '=', 'mail.channel'), ('res_id', '=', group.id), ('message_type', '!=', 'notification')]
         if mode == 'thread':
             domain += [('parent_id', '=', False)]
         if date_begin and date_end:
diff --git a/addons/website_mail_channel/i18n/af.po b/addons/website_mail_channel/i18n/af.po
new file mode 100644
index 00000000000..022c606ebde
--- /dev/null
+++ b/addons/website_mail_channel/i18n/af.po
@@ -0,0 +1,230 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_mail_channel
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo 9.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-07 14:41+0000\n"
+"PO-Revision-Date: 2015-11-26 09:48+0000\n"
+"Last-Translator: Martin Trigaux\n"
+"Language-Team: Afrikaans (http://www.transifex.com/odoo/odoo-9/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
+msgstr ""
+
+#. module: website_mail_channel
+#. openerp-web
+#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:19
+#, python-format
+msgid "Add a Subscribe Button"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Alone we can do so little, together we can do so much"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+msgid "Archives"
+msgstr "Argiewe"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+msgid "Browse archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+msgid "By date"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+msgid "By thread"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "Change Discussion List"
+msgstr ""
+
+#. module: website_mail_channel
+#. openerp-web
+#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:20
+#, python-format
+msgid "Discussion List"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_path
+msgid "Discussion Path"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.model,name:website_mail_channel.model_mail_channel
+msgid "Discussion channel"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+msgid "Follow-Ups"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
+msgid "Mailing List"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+msgid "Mailing Lists"
+msgstr ""
+
+#. module: website_mail_channel
+#: code:addons/website_mail_channel/models/mail_mail.py:23
+#, python-format
+msgid "Mailing-List"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.model.fields,help:website_mail_channel.field_mail_mail_description
+msgid "Message description: either the subject, or the beginning of the body"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid ""
+"Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down "
+"pull-right\"/>"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.model,name:website_mail_channel.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: website_mail_channel
+#: code:addons/website_mail_channel/models/mail_mail.py:24
+#, python-format
+msgid "Post to"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_website_published
+msgid "Published"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+msgid "Reference"
+msgstr "Verwysing"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Stay in touch with our Community"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "Subscribe"
+msgstr ""
+
+#. module: website_mail_channel
+#: code:addons/website_mail_channel/models/mail_mail.py:25
+#, python-format
+msgid "Unsubscribe"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.model.fields,help:website_mail_channel.field_mail_mail_path
+msgid ""
+"Used to display messages in a paragraph-based chatter using a unique path;"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.model.fields,help:website_mail_channel.field_mail_mail_website_published
+msgid "Visible on the website as a comment"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+msgid "attachments"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "by"
+msgstr "deur"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+msgid "mailing list archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid ""
+"members<br/>\n"
+"                    <i class=\"fa fa-fw fa-envelope-o\"/>"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "messages / month"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "more replies"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "replies"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "send mail"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "show"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_description
+msgid "unknown"
+msgstr "onbekend"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "unsubscribe"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "your email..."
+msgstr ""
diff --git a/addons/website_mail_channel/i18n/el.po b/addons/website_mail_channel/i18n/el.po
index 27da81e3061..76a5d076285 100644
--- a/addons/website_mail_channel/i18n/el.po
+++ b/addons/website_mail_channel/i18n/el.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-11-21 12:14+0000\n"
+"PO-Revision-Date: 2015-12-05 14:33+0000\n"
 "Last-Translator: Goutoudis Kostas <goutoudis@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/odoo/odoo-9/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -28,12 +28,12 @@ msgstr ""
 #: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:19
 #, python-format
 msgid "Add a Subscribe Button"
-msgstr ""
+msgstr "Προσθέστε ένα κουμπί 'Εγγραφή'"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
 msgid "Alone we can do so little, together we can do so much"
-msgstr ""
+msgstr "Μόνοι μας μπορούμε να κάνουμε τόσα λίγα, μαζί μπορούμε να κάνουμε τόσα πολλά"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_messages
@@ -43,7 +43,7 @@ msgstr "Αρχειοθετημένα"
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 msgid "Browse archives"
-msgstr ""
+msgstr "Περιήγηση στα αρχειοθετημένα"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
@@ -55,19 +55,19 @@ msgstr "Ανά ημερομηνία"
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 #: model:ir.ui.view,arch_db:website_mail_channel.group_messages
 msgid "By thread"
-msgstr ""
+msgstr "Ανά νήμα"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
 msgid "Change Discussion List"
-msgstr ""
+msgstr "Αλλαγή Λίστας Συζήτησης"
 
 #. module: website_mail_channel
 #. openerp-web
 #: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:20
 #, python-format
 msgid "Discussion List"
-msgstr ""
+msgstr "Λίστα Συζήτησης"
 
 #. module: website_mail_channel
 #: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_path
@@ -82,24 +82,24 @@ msgstr "Κανάλι Συζήτησης"
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 msgid "Follow-Ups"
-msgstr ""
+msgstr "Παρακολούθηση"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
 msgid "Mailing List"
-msgstr ""
+msgstr "Λίστα Αλληλογραφίας"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 #: model:ir.ui.view,arch_db:website_mail_channel.group_messages
 msgid "Mailing Lists"
-msgstr ""
+msgstr "Λίστες Αλληλογραφίας"
 
 #. module: website_mail_channel
 #: code:addons/website_mail_channel/models/mail_mail.py:23
 #, python-format
 msgid "Mailing-List"
-msgstr ""
+msgstr "Λίστα-Αλληλογραφίας"
 
 #. module: website_mail_channel
 #: model:ir.model.fields,help:website_mail_channel.field_mail_mail_description
@@ -122,7 +122,7 @@ msgstr "Εξερχόμενα μηνύματα"
 #: code:addons/website_mail_channel/models/mail_mail.py:24
 #, python-format
 msgid "Post to"
-msgstr ""
+msgstr "Δημοσίευση στο"
 
 #. module: website_mail_channel
 #: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_website_published
@@ -137,7 +137,7 @@ msgstr "Αναφορά"
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
 msgid "Stay in touch with our Community"
-msgstr ""
+msgstr "Μείνετε σε επαφή με την Κοινότητά μας"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -164,12 +164,12 @@ msgstr "Ορατό στον ιστότοπο ως ένα σχόλιο"
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
 msgid "archives"
-msgstr ""
+msgstr "αρχειοθετημένα"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 msgid "attachments"
-msgstr ""
+msgstr "συνημμένα"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
@@ -181,7 +181,7 @@ msgstr "από"
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 #: model:ir.ui.view,arch_db:website_mail_channel.group_messages
 msgid "mailing list archives"
-msgstr ""
+msgstr "αρχειοθετημένες λίστες αλληλογραφίας"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
@@ -193,22 +193,22 @@ msgstr ""
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
 msgid "messages / month"
-msgstr ""
+msgstr "μηνύματα / μήνα"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.messages_short
 msgid "more replies"
-msgstr ""
+msgstr "περισσότερες απαντήσεις"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.messages_short
 msgid "replies"
-msgstr ""
+msgstr "απαντήσεις"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
 msgid "send mail"
-msgstr ""
+msgstr "αποστολή email"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.messages_short
@@ -223,7 +223,7 @@ msgstr "άγνωστο"
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
 msgid "unsubscribe"
-msgstr ""
+msgstr "Διαγραφή"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
diff --git a/addons/website_mail_channel/i18n/es_EC.po b/addons/website_mail_channel/i18n/es_EC.po
index 817b5859d92..a8460a9eb78 100644
--- a/addons/website_mail_channel/i18n/es_EC.po
+++ b/addons/website_mail_channel/i18n/es_EC.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-11-16 05:27+0000\n"
+"PO-Revision-Date: 2015-12-01 20:29+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Spanish (Ecuador) (http://www.transifex.com/odoo/odoo-9/language/es_EC/)\n"
 "MIME-Version: 1.0\n"
@@ -174,7 +174,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 #: model:ir.ui.view,arch_db:website_mail_channel.messages_short
 msgid "by"
-msgstr ""
+msgstr "por"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
diff --git a/addons/website_mail_channel/i18n/id.po b/addons/website_mail_channel/i18n/id.po
index 49927ff775e..ccc20e1b1dd 100644
--- a/addons/website_mail_channel/i18n/id.po
+++ b/addons/website_mail_channel/i18n/id.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-11-17 12:36+0000\n"
+"PO-Revision-Date: 2015-12-02 23:35+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Indonesian (http://www.transifex.com/odoo/odoo-9/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -27,12 +27,12 @@ msgstr ""
 #: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:19
 #, python-format
 msgid "Add a Subscribe Button"
-msgstr ""
+msgstr "Tambahkan tombol berlangganan"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
 msgid "Alone we can do so little, together we can do so much"
-msgstr ""
+msgstr "Kita dapat melakukannya sedikit saja, bersama-sama kita dapat melakukan begitu banyak"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_messages
@@ -42,31 +42,31 @@ msgstr "Arsip"
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 msgid "Browse archives"
-msgstr ""
+msgstr "Menelusuri arsip"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 #: model:ir.ui.view,arch_db:website_mail_channel.group_messages
 msgid "By date"
-msgstr ""
+msgstr "Menurut tanggal"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 #: model:ir.ui.view,arch_db:website_mail_channel.group_messages
 msgid "By thread"
-msgstr ""
+msgstr "Oleh thread"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
 msgid "Change Discussion List"
-msgstr ""
+msgstr "Daftar diskusi perubahan"
 
 #. module: website_mail_channel
 #. openerp-web
 #: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:20
 #, python-format
 msgid "Discussion List"
-msgstr ""
+msgstr "Daftar diskusi"
 
 #. module: website_mail_channel
 #: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_path
@@ -81,29 +81,29 @@ msgstr ""
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 msgid "Follow-Ups"
-msgstr ""
+msgstr "Tindak lanjut"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
 msgid "Mailing List"
-msgstr ""
+msgstr "Milis"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 #: model:ir.ui.view,arch_db:website_mail_channel.group_messages
 msgid "Mailing Lists"
-msgstr ""
+msgstr "Milis"
 
 #. module: website_mail_channel
 #: code:addons/website_mail_channel/models/mail_mail.py:23
 #, python-format
 msgid "Mailing-List"
-msgstr ""
+msgstr "Milis"
 
 #. module: website_mail_channel
 #: model:ir.model.fields,help:website_mail_channel.field_mail_mail_description
 msgid "Message description: either the subject, or the beginning of the body"
-msgstr ""
+msgstr "Deskripsi pesan: baik subjek, atau awal tubuh"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
@@ -121,7 +121,7 @@ msgstr "Outgoing Mail"
 #: code:addons/website_mail_channel/models/mail_mail.py:24
 #, python-format
 msgid "Post to"
-msgstr ""
+msgstr "Posting ke"
 
 #. module: website_mail_channel
 #: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_website_published
@@ -136,7 +136,7 @@ msgstr "Referensi"
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
 msgid "Stay in touch with our Community"
-msgstr ""
+msgstr "Tetap berhubungan dengan komunitas kami"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -158,17 +158,17 @@ msgstr ""
 #. module: website_mail_channel
 #: model:ir.model.fields,help:website_mail_channel.field_mail_mail_website_published
 msgid "Visible on the website as a comment"
-msgstr ""
+msgstr "Terlihat pada website sebagai komentar"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
 msgid "archives"
-msgstr ""
+msgstr "Arsip"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 msgid "attachments"
-msgstr ""
+msgstr "Lampiran"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
@@ -180,7 +180,7 @@ msgstr "oleh"
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 #: model:ir.ui.view,arch_db:website_mail_channel.group_messages
 msgid "mailing list archives"
-msgstr ""
+msgstr "Arsip milis"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
@@ -192,22 +192,22 @@ msgstr ""
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
 msgid "messages / month"
-msgstr ""
+msgstr "pesan / bulan"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.messages_short
 msgid "more replies"
-msgstr ""
+msgstr "lain Balasan"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.messages_short
 msgid "replies"
-msgstr ""
+msgstr "balasan"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
 msgid "send mail"
-msgstr ""
+msgstr "Kirim email"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.messages_short
@@ -222,7 +222,7 @@ msgstr "tidak diketahui"
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
 msgid "unsubscribe"
-msgstr ""
+msgstr "Berhenti langganan"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
diff --git a/addons/website_mail_channel/i18n/uk.po b/addons/website_mail_channel/i18n/uk.po
new file mode 100644
index 00000000000..b179d825093
--- /dev/null
+++ b/addons/website_mail_channel/i18n/uk.po
@@ -0,0 +1,230 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_mail_channel
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo 9.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-07 14:41+0000\n"
+"PO-Revision-Date: 2015-11-30 14:19+0000\n"
+"Last-Translator: Bogdan\n"
+"Language-Team: Ukrainian (http://www.transifex.com/odoo/odoo-9/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: uk\n"
+"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_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
+msgstr ""
+
+#. module: website_mail_channel
+#. openerp-web
+#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:19
+#, python-format
+msgid "Add a Subscribe Button"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Alone we can do so little, together we can do so much"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+msgid "Archives"
+msgstr "Архіви"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+msgid "Browse archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+msgid "By date"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+msgid "By thread"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "Change Discussion List"
+msgstr ""
+
+#. module: website_mail_channel
+#. openerp-web
+#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:20
+#, python-format
+msgid "Discussion List"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_path
+msgid "Discussion Path"
+msgstr "Шлях обговорення"
+
+#. module: website_mail_channel
+#: model:ir.model,name:website_mail_channel.model_mail_channel
+msgid "Discussion channel"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+msgid "Follow-Ups"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
+msgid "Mailing List"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+msgid "Mailing Lists"
+msgstr ""
+
+#. module: website_mail_channel
+#: code:addons/website_mail_channel/models/mail_mail.py:23
+#, python-format
+msgid "Mailing-List"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.model.fields,help:website_mail_channel.field_mail_mail_description
+msgid "Message description: either the subject, or the beginning of the body"
+msgstr "Опис повідомлення: тема або початок тіла листа"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid ""
+"Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down "
+"pull-right\"/>"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.model,name:website_mail_channel.model_mail_mail
+msgid "Outgoing Mails"
+msgstr "Вихідна пошта"
+
+#. module: website_mail_channel
+#: code:addons/website_mail_channel/models/mail_mail.py:24
+#, python-format
+msgid "Post to"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_website_published
+msgid "Published"
+msgstr "Опубліковано"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+msgid "Reference"
+msgstr "Reference"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Stay in touch with our Community"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "Subscribe"
+msgstr "Підписатися"
+
+#. module: website_mail_channel
+#: code:addons/website_mail_channel/models/mail_mail.py:25
+#, python-format
+msgid "Unsubscribe"
+msgstr "Відписатися"
+
+#. module: website_mail_channel
+#: model:ir.model.fields,help:website_mail_channel.field_mail_mail_path
+msgid ""
+"Used to display messages in a paragraph-based chatter using a unique path;"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.model.fields,help:website_mail_channel.field_mail_mail_website_published
+msgid "Visible on the website as a comment"
+msgstr "Показано на сайті як коментар"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+msgid "attachments"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "by"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+msgid "mailing list archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid ""
+"members<br/>\n"
+"                    <i class=\"fa fa-fw fa-envelope-o\"/>"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "messages / month"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "more replies"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "replies"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "send mail"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "show"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_description
+msgid "unknown"
+msgstr "невідомий"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "unsubscribe"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "your email..."
+msgstr "Ваш email..."
diff --git a/addons/website_mail_channel/i18n/zh_CN.po b/addons/website_mail_channel/i18n/zh_CN.po
index 83b081c5d11..6abd0eb1dad 100644
--- a/addons/website_mail_channel/i18n/zh_CN.po
+++ b/addons/website_mail_channel/i18n/zh_CN.po
@@ -3,14 +3,16 @@
 # * website_mail_channel
 # 
 # Translators:
+# fausthuang, 2015
 # liulixia <liu.lixia@elico-corp.com>, 2015
+# 珠海-老天 <liangjia@qq.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-11 02:11+0000\n"
-"Last-Translator: liulixia <liu.lixia@elico-corp.com>\n"
+"PO-Revision-Date: 2015-12-01 09:09+0000\n"
+"Last-Translator: fausthuang\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +23,7 @@ msgstr ""
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
 msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
-msgstr ""
+msgstr "<span class=\"oe_snippet_thumbnail_title\">讨论组</span>"
 
 #. module: website_mail_channel
 #. openerp-web
@@ -77,7 +79,7 @@ msgstr "讨论路径"
 #. module: website_mail_channel
 #: model:ir.model,name:website_mail_channel.model_mail_channel
 msgid "Discussion channel"
-msgstr ""
+msgstr "讨论渠道"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
@@ -111,7 +113,7 @@ msgstr "消息描述：可以选择主题或正文的开始部分作为消息的
 msgid ""
 "Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down "
 "pull-right\"/>"
-msgstr ""
+msgstr "需要取消订阅？ 在这里！<span class=\"fa fa-2x fa-arrow-down pull-right\"/>"
 
 #. module: website_mail_channel
 #: model:ir.model,name:website_mail_channel.model_mail_mail
@@ -188,7 +190,7 @@ msgstr "邮件列表存档  "
 msgid ""
 "members<br/>\n"
 "                    <i class=\"fa fa-fw fa-envelope-o\"/>"
-msgstr ""
+msgstr "成员"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
diff --git a/addons/website_mail_channel/models/mail_channel.py b/addons/website_mail_channel/models/mail_channel.py
index bca5793fb31..625f00978b4 100644
--- a/addons/website_mail_channel/models/mail_channel.py
+++ b/addons/website_mail_channel/models/mail_channel.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from openerp import api
 from openerp.osv import osv
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.addons.website.models.website import slug
@@ -8,6 +9,7 @@ from openerp.addons.website.models.website import slug
 class MailGroup(osv.Model):
     _inherit = 'mail.channel'
 
+    @api.cr_uid_ids_context
     def message_get_email_values(self, cr, uid, id, notif_mail=None, context=None):
         res = super(MailGroup, self).message_get_email_values(cr, uid, id, notif_mail=notif_mail, context=context)
         group = self.browse(cr, uid, id, context=context)