[MERGE] forward port of branch saas-7 up to 4022493

19 files changed, 90 insertions, 81 deletions

diff --git a/addons/im_livechat/i18n/ca.po b/addons/im_livechat/i18n/ca.po
index 56ee40e218e..9d35bd936f6 100644
--- a/addons/im_livechat/i18n/ca.po
+++ b/addons/im_livechat/i18n/ca.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 09:20+0000\n"
-"PO-Revision-Date: 2015-11-21 21:26+0000\n"
+"PO-Revision-Date: 2015-12-05 23:06+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Catalan (http://www.transifex.com/odoo/odoo-9/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgstr ""
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.support_page
 msgid "<!DOCTYPE html>"
-msgstr ""
+msgstr "<!DOCTYPE html>"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.loader
@@ -674,7 +674,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
 msgid "Sessions"
-msgstr ""
+msgstr "Sessions "
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_image_small
diff --git a/addons/im_livechat/i18n/de.po b/addons/im_livechat/i18n/de.po
index 5867539f88c..f5cbf40101f 100644
--- a/addons/im_livechat/i18n/de.po
+++ b/addons/im_livechat/i18n/de.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 09:20+0000\n"
-"PO-Revision-Date: 2015-11-17 21:23+0000\n"
+"PO-Revision-Date: 2015-11-23 09:25+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: German (http://www.transifex.com/odoo/odoo-9/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -617,7 +617,7 @@ msgstr "Schließen"
 #: model:ir.model,name:im_livechat.model_rating_rating
 #: model:ir.model.fields,field_description:im_livechat.field_mail_channel_rating_ids
 msgid "Rating"
-msgstr ""
+msgstr "Bewertung"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_regex_url
diff --git a/addons/im_livechat/i18n/el.po b/addons/im_livechat/i18n/el.po
index 55bd03c8a73..f66253b9213 100644
--- a/addons/im_livechat/i18n/el.po
+++ b/addons/im_livechat/i18n/el.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 09:20+0000\n"
-"PO-Revision-Date: 2015-11-21 22:42+0000\n"
+"PO-Revision-Date: 2015-12-05 19:26+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"
@@ -788,7 +788,7 @@ msgstr "Χρήστης"
 #: code:addons/im_livechat/static/src/js/im_livechat.js:27
 #, python-format
 msgid "Visitor"
-msgstr ""
+msgstr "Επισκέπτης"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_web_page
diff --git a/addons/im_livechat/i18n/es_CO.po b/addons/im_livechat/i18n/es_CO.po
index dbc85bb2bba..6530171fa1e 100644
--- a/addons/im_livechat/i18n/es_CO.po
+++ b/addons/im_livechat/i18n/es_CO.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 09:20+0000\n"
-"PO-Revision-Date: 2015-11-12 05:49+0000\n"
+"PO-Revision-Date: 2015-11-28 07:09+0000\n"
 "Last-Translator: Mateo Tibaquirá <nestormateo@gmail.com>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/odoo/odoo-9/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -35,18 +35,18 @@ msgstr "\", {modules:modules, use_cors: false});\n                    });"
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_nbr_channel
 msgid "# of channel"
-msgstr ""
+msgstr "# de canal"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_nbr_speaker
 msgid "# of speakers"
-msgstr ""
+msgstr "# de ponentes"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rating_percentage_satisfaction
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
 msgid "% Happy"
-msgstr ""
+msgstr "% Feliz"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.support_page
@@ -101,7 +101,7 @@ msgstr ""
 #: code:addons/im_livechat/static/src/js/im_livechat.js:26
 #, python-format
 msgid "Ask something ..."
-msgstr ""
+msgstr "Haga su pregunta..."
 
 #. module: im_livechat
 #: selection:im_livechat.channel.rule,action:0
@@ -743,7 +743,7 @@ msgstr "Este campo guarda la imagen usada como la foto del grupo, limitada a 102
 msgid ""
 "This is an automated 'welcome' message that your visitor will see when they "
 "initiate a new conversation."
-msgstr ""
+msgstr "Este es un mensaje de 'bienvenida' automático que verá su visitante cuando inicie una nueva conversación."
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_image_small
diff --git a/addons/im_livechat/i18n/es_EC.po b/addons/im_livechat/i18n/es_EC.po
index 04d5abc46e3..305411988ba 100644
--- a/addons/im_livechat/i18n/es_EC.po
+++ b/addons/im_livechat/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-10-09 09:20+0000\n"
-"PO-Revision-Date: 2015-10-18 23:31+0000\n"
+"PO-Revision-Date: 2015-11-27 06: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"
@@ -879,4 +879,4 @@ msgstr ""
 #: code:addons/im_livechat/static/src/xml/im_livechat_backend.xml:12
 #, python-format
 msgid "true"
-msgstr ""
+msgstr "verdadero"
diff --git a/addons/im_livechat/i18n/fr.po b/addons/im_livechat/i18n/fr.po
index 57a2bcf5a9c..05ba55b5013 100644
--- a/addons/im_livechat/i18n/fr.po
+++ b/addons/im_livechat/i18n/fr.po
@@ -7,14 +7,15 @@
 # Lucas Deliege <lud@odoo.com>, 2015
 # Maxime Chambreuil <maxime.chambreuil@gmail.com>, 2015
 # Melanie Bernard <mbe@odoo.com>, 2015
+# Quentin THEURET <quentin@theuret.net>, 2015
 # Symons Xavier <xsy@openerp.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 09:20+0000\n"
-"PO-Revision-Date: 2015-11-24 23:00+0000\n"
-"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\n"
+"PO-Revision-Date: 2015-12-02 16:08+0000\n"
+"Last-Translator: Saad Thaifa <saad.thaifa@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/odoo/odoo-9/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -339,7 +340,7 @@ msgstr "Général"
 msgid ""
 "Given the order to find a matching rule. If 2 rules are matching for the "
 "given url/country, the one with the lowest sequence will be chosen."
-msgstr ""
+msgstr "Donne l'ordre pour trouver une règle correspondante. Si 2 règles correspondent à l'adresse/pays donnée, celle avec la séquence la plus petite sera choisie."
 
 #. module: im_livechat
 #. openerp-web
@@ -476,7 +477,7 @@ msgid ""
 "Livechat Support Channel Statistics allows you to easily check and analyse "
 "your company livechat session performance. Extract informations about the "
 "missed sessions, the audiance, the duration of a session, etc."
-msgstr ""
+msgstr "Les statistiques de canaux du Support Livechat vous permettent de facilement vérifier et analyser la performance des sessions de conversations instantanées de votre société. Vous pouvez extraire les informations à propos des sessions ratées, l'audience, la durée d'une session, etc."
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.support_page
@@ -762,7 +763,7 @@ msgstr "Temps pour répondre"
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search
 msgid "Treated sessions"
-msgstr ""
+msgstr "Sessions traitées"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_regex_url
@@ -774,7 +775,7 @@ msgstr "Expression régulière de l'URL"
 msgid ""
 "URL to a static page where you client can discuss with the operator of the "
 "channel."
-msgstr ""
+msgstr "URL vers une page statique où votre client peut discuter avec l'opérateur de la chaîne."
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_uuid
diff --git a/addons/im_livechat/i18n/id.po b/addons/im_livechat/i18n/id.po
index 034252d5143..3b01e5e6df2 100644
--- a/addons/im_livechat/i18n/id.po
+++ b/addons/im_livechat/i18n/id.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 09:20+0000\n"
-"PO-Revision-Date: 2015-11-17 12:36+0000\n"
+"PO-Revision-Date: 2015-12-03 00:11+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"
@@ -314,7 +314,7 @@ msgstr ""
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_form
 msgid "Feedback"
-msgstr ""
+msgstr "Masukan"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
@@ -511,7 +511,7 @@ msgstr ""
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_image_medium
 msgid "Medium"
-msgstr ""
+msgstr "Medium"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_image_medium
@@ -611,13 +611,13 @@ msgstr "Pengaturan"
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
 msgid "Quit"
-msgstr ""
+msgstr "Keluar"
 
 #. module: im_livechat
 #: model:ir.model,name:im_livechat.model_rating_rating
 #: model:ir.model.fields,field_description:im_livechat.field_mail_channel_rating_ids
 msgid "Rating"
-msgstr ""
+msgstr "Peringkat"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_regex_url
@@ -635,7 +635,7 @@ msgstr "Laporan"
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_ids
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_rule_view_tree
 msgid "Rules"
-msgstr ""
+msgstr "Peraturan"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_script_external
@@ -774,7 +774,7 @@ msgstr ""
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_uuid
 msgid "UUID"
-msgstr ""
+msgstr "UUID:"
 
 #. module: im_livechat
 #: model:res.groups,name:im_livechat.im_livechat_group_user
@@ -787,7 +787,7 @@ msgstr "Pengguna"
 #: code:addons/im_livechat/static/src/js/im_livechat.js:27
 #, python-format
 msgid "Visitor"
-msgstr ""
+msgstr "Pengunjung"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_web_page
diff --git a/addons/im_livechat/i18n/lt.po b/addons/im_livechat/i18n/lt.po
index db1a9684ea5..08094de0707 100644
--- a/addons/im_livechat/i18n/lt.po
+++ b/addons/im_livechat/i18n/lt.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 09:20+0000\n"
-"PO-Revision-Date: 2015-11-09 10:10+0000\n"
+"PO-Revision-Date: 2015-11-22 16:10+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Lithuanian (http://www.transifex.com/odoo/odoo-9/language/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgstr ""
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.support_page
 msgid "&lt;!DOCTYPE html&gt;"
-msgstr ""
+msgstr "&lt;!DOCTYPE html&gt;"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.loader
diff --git a/addons/im_livechat/i18n/pt.po b/addons/im_livechat/i18n/pt.po
index 8a9b2a3890d..c89ee5375dd 100644
--- a/addons/im_livechat/i18n/pt.po
+++ b/addons/im_livechat/i18n/pt.po
@@ -3,13 +3,14 @@
 # * im_livechat
 # 
 # Translators:
+# Martin Trigaux, 2015
 # Ricardo Martins <ricardo.nbs.martins@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 09:20+0000\n"
-"PO-Revision-Date: 2015-10-10 09:48+0000\n"
+"PO-Revision-Date: 2015-12-03 13:18+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Portuguese (http://www.transifex.com/odoo/odoo-9/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -201,7 +202,7 @@ msgstr "Conversa"
 msgid ""
 "Copy and paste this code into your website, within the &amp;lt;head&amp;gt; "
 "tag:"
-msgstr "Copie e cole este código no seu website, no & lt; cabeça & gt; tag:"
+msgstr "Copie e cole este código no seu website, no &amp;lt;head&amp;gt; tag:"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_country_ids
@@ -880,4 +881,4 @@ msgstr "segundos"
 #: code:addons/im_livechat/static/src/xml/im_livechat_backend.xml:12
 #, python-format
 msgid "true"
-msgstr ""
+msgstr "verdadeiro"
diff --git a/addons/im_livechat/i18n/pt_BR.po b/addons/im_livechat/i18n/pt_BR.po
index be00e6c44af..37645143ca2 100644
--- a/addons/im_livechat/i18n/pt_BR.po
+++ b/addons/im_livechat/i18n/pt_BR.po
@@ -3,14 +3,15 @@
 # * im_livechat
 # 
 # Translators:
+# Martin Trigaux, 2015
 # Mateus Cerqueira Lopes <mateus1@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 09:20+0000\n"
-"PO-Revision-Date: 2015-11-12 16:36+0000\n"
-"Last-Translator: Mateus Cerqueira Lopes <mateus1@gmail.com>\n"
+"PO-Revision-Date: 2015-12-02 13:54+0000\n"
+"Last-Translator: Martin Trigaux\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +52,7 @@ msgstr ""
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.support_page
 msgid "&lt;!DOCTYPE html&gt;"
-msgstr "<!DOCTYPE html>"
+msgstr "&lt;!DOCTYPE html&gt;"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.loader
diff --git a/addons/im_livechat/i18n/tr.po b/addons/im_livechat/i18n/tr.po
index 6d07b9e135f..2cc99594d8b 100644
--- a/addons/im_livechat/i18n/tr.po
+++ b/addons/im_livechat/i18n/tr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 09:20+0000\n"
-"PO-Revision-Date: 2015-10-12 12:56+0000\n"
+"PO-Revision-Date: 2015-12-03 09:32+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Turkish (http://www.transifex.com/odoo/odoo-9/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgstr ""
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.support_page
 msgid "&lt;!DOCTYPE html&gt;"
-msgstr ""
+msgstr "&lt;!DOCTYPE html&gt;"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.loader
diff --git a/addons/im_livechat/i18n/zh_CN.po b/addons/im_livechat/i18n/zh_CN.po
index ece740d535e..9abd06ac857 100644
--- a/addons/im_livechat/i18n/zh_CN.po
+++ b/addons/im_livechat/i18n/zh_CN.po
@@ -5,13 +5,14 @@
 # Translators:
 # Alex Duan <alex.duan@elico-corp.com>, 2015
 # JiangZhixiao <zhixiao.jiang1984@gmail.com>, 2015
+# 榴莲 <nocoolyoyo@bengentea.top>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 09:20+0000\n"
-"PO-Revision-Date: 2015-11-12 07:49+0000\n"
-"Last-Translator: JiangZhixiao <zhixiao.jiang1984@gmail.com>\n"
+"PO-Revision-Date: 2015-12-02 07:06+0000\n"
+"Last-Translator: Gary Wei <Gary.wei@elico-corp.com>\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"
@@ -31,12 +32,12 @@ msgstr "原因如下:%s"
 msgid ""
 "\", {modules:modules, use_cors: false});\n"
 "                    });"
-msgstr ""
+msgstr "\", {modules:modules, use_cors: false});\n                    });"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_nbr_channel
 msgid "# of channel"
-msgstr "渠道"
+msgstr "频道"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_nbr_speaker
@@ -336,7 +337,7 @@ msgstr "通用"
 msgid ""
 "Given the order to find a matching rule. If 2 rules are matching for the "
 "given url/country, the one with the lowest sequence will be chosen."
-msgstr ""
+msgstr "帮助订单找到匹配规则。如果两条规则同时匹配给定的Url/国家，会选择低序列的一个"
 
 #. module: im_livechat
 #. openerp-web
@@ -473,7 +474,7 @@ msgid ""
 "Livechat Support Channel Statistics allows you to easily check and analyse "
 "your company livechat session performance. Extract informations about the "
 "missed sessions, the audiance, the duration of a session, etc."
-msgstr ""
+msgstr "实时交流渠道分析能让你便捷的检查和分析贵司的实时聊天会话的表现。提取出来错失的会话，顾客群，会话持续时间等等"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.support_page
@@ -484,13 +485,13 @@ msgstr "即时聊天支持页面"
 #: model:ir.model,name:im_livechat.model_im_livechat_report_channel
 #: model:ir.model,name:im_livechat.model_im_livechat_report_operator
 msgid "Livechat Support Report"
-msgstr ""
+msgstr "实时聊天支持报表"
 
 #. module: im_livechat
 #: model:ir.actions.act_window,name:im_livechat.im_livechat_report_channel_action
 #: model:ir.actions.act_window,name:im_livechat.im_livechat_report_operator_action
 msgid "Livechat Support Report Channel"
-msgstr ""
+msgstr "实时聊天支持报表渠道"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_graph
@@ -598,12 +599,12 @@ msgid ""
 "Operators\n"
 "                                            <br/>\n"
 "                                            <i class=\"fa fa-comments\"/>"
-msgstr ""
+msgstr "操作员\n                                            <br/>\n                                            <i class=\"fa fa-comments\"/>"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_partner_id
 msgid "Opertor"
-msgstr ""
+msgstr "Opertor"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
@@ -626,7 +627,7 @@ msgstr "评级"
 msgid ""
 "Regular expression identifying the web page on which the rules will be "
 "applied."
-msgstr ""
+msgstr "规则的表达定义了可以选用规则的web页面"
 
 #. module: im_livechat
 #: model:ir.ui.menu,name:im_livechat.menu_reporting_livechat
@@ -653,7 +654,7 @@ msgstr "搜索历史"
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_operator_view_search
 msgid "Search report"
-msgstr ""
+msgstr "搜索报表"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search
@@ -663,7 +664,7 @@ msgstr "会话"
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_form
 msgid "Session Form"
-msgstr ""
+msgstr "会话表格"
 
 #. module: im_livechat
 #: model:ir.ui.menu,name:im_livechat.menu_reporting_livechat_channel
@@ -690,13 +691,13 @@ msgstr "群组的小尺寸照片. 被自动缩放到64x64px，保持纵横比。
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_start_date
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_start_date
 msgid "Start Date of session"
-msgstr ""
+msgstr "会话的开始日期"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_report_channel_start_date
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_report_operator_start_date
 msgid "Start date of the conversation"
-msgstr ""
+msgstr "会话的开始日期"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_button_text
@@ -710,17 +711,17 @@ msgid ""
 "'Belgium' and 'France' and you set the action to 'Hide Buttun', this 2 "
 "country will not be see the support button for the specified URL. This "
 "feature requires GeoIP installed on your server."
-msgstr ""
+msgstr "实际的规则只和国家匹配。所以如果你选择了‘比利时’和‘法国’并且设置相关动作到‘隐藏按钮’，那么这两个国家在特定URL支持按钮中将不可见。需要安装GeoIP才能实现这个特性"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_channel_id
 msgid "The channel of the rule"
-msgstr ""
+msgstr "规则的渠道"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_name
 msgid "The name of the channel"
-msgstr ""
+msgstr "渠道的名称"
 
 #. module: im_livechat
 #: model:res.groups,comment:im_livechat.im_livechat_group_manager
@@ -744,34 +745,34 @@ msgstr "这个字段保存的图片作为群组的照片，限制为  1024x1024p
 msgid ""
 "This is an automated 'welcome' message that your visitor will see when they "
 "initiate a new conversation."
-msgstr ""
+msgstr "这是一个自动的‘欢迎’信息，当初始化新的会话的时候访问者会看到"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_image_small
 msgid "Thumbnail"
-msgstr ""
+msgstr "略所图"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_time_to_answer
 msgid "Time to answer"
-msgstr ""
+msgstr "该回答了"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search
 msgid "Treated sessions"
-msgstr ""
+msgstr "已处理的会话"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_regex_url
 msgid "URL Regex"
-msgstr ""
+msgstr "URL的正则表达式"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_web_page
 msgid ""
 "URL to a static page where you client can discuss with the operator of the "
 "channel."
-msgstr ""
+msgstr "你可以在静态网页的URL和客户讨论"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_uuid
@@ -809,7 +810,7 @@ msgstr "网站在线客服"
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.support_page
 msgid "Website Live Chat Powered by <strong>Odoo</strong>."
-msgstr ""
+msgstr "<strong>Odoo</strong>的实时聊天"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_default_message
@@ -822,12 +823,12 @@ msgid ""
 "You can create channels for each website on which you want\n"
 "                to integrate the website live chat widget, allowing you website\n"
 "                visitors to talk in real time with your operators."
-msgstr ""
+msgstr "你可以给每个你想集成即时聊天功能的网站创建渠道网站的访问者可以和客服实时聊天"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.loader
 msgid "document.addEventListener(\"DOMContentLoaded\", function(event) {"
-msgstr ""
+msgstr "document.addEventListener(\"DOMContentLoaded\", function(event) {"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
@@ -844,7 +845,7 @@ msgstr "例如：你的网站地址 "
 #: code:addons/im_livechat/static/src/xml/im_livechat_backend.xml:6
 #, python-format
 msgid "livechat"
-msgstr ""
+msgstr "即时聊天"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.loader
@@ -854,7 +855,7 @@ msgid ""
 "                        var button = new im_livechat.LivechatButton(\n"
 "                            $('body'),\n"
 "                            \""
-msgstr ""
+msgstr "odoo.define('im_livechat.livesupport', function (require) {\n                        var im_livechat = require('im_livechat.im_livechat');\n                        var button = new im_livechat.LivechatButton(\n                            $('body'),\n                            \""
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.loader
@@ -863,7 +864,7 @@ msgid ""
 "                        var Session = require('web.Session');\n"
 "                        var modules = odoo._modules;\n"
 "                        return new Session(undefined, \""
-msgstr ""
+msgstr "odoo.define('web.session', function (require) {\n                        var Session = require('web.Session');\n                        var modules = odoo._modules;\n                        return new Session(undefined, \""
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
@@ -881,4 +882,4 @@ msgstr "秒数"
 #: code:addons/im_livechat/static/src/xml/im_livechat_backend.xml:12
 #, python-format
 msgid "true"
-msgstr ""
+msgstr "真"
diff --git a/addons/im_livechat/i18n/zh_TW.po b/addons/im_livechat/i18n/zh_TW.po
index 3a6fd6108bd..6b0c5672441 100644
--- a/addons/im_livechat/i18n/zh_TW.po
+++ b/addons/im_livechat/i18n/zh_TW.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 09:20+0000\n"
-"PO-Revision-Date: 2015-10-10 09:48+0000\n"
+"PO-Revision-Date: 2015-12-04 06:06+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/odoo/odoo-9/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -611,7 +611,7 @@ msgstr "選項"
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
 msgid "Quit"
-msgstr ""
+msgstr "退出"
 
 #. module: im_livechat
 #: model:ir.model,name:im_livechat.model_rating_rating
diff --git a/addons/im_livechat/models/im_livechat_channel.py b/addons/im_livechat/models/im_livechat_channel.py
index 68e1bf54fd9..b4e21368586 100644
--- a/addons/im_livechat/models/im_livechat_channel.py
+++ b/addons/im_livechat/models/im_livechat_channel.py
@@ -3,6 +3,7 @@ import json
 import openerp
 import random
 import re
+from datetime import datetime, timedelta
 
 from openerp import api, fields, models
 from openerp import tools
@@ -40,7 +41,9 @@ class ImLivechatChannel(models.Model):
         compute='_are_you_inside', store=False, readonly=True)
     script_external = fields.Text('Script (external)', compute='_compute_script_external', store=False, readonly=True)
     nbr_channel = fields.Integer('Number of conversation', compute='_compute_nbr_channel', store=False, readonly=True)
-    rating_percentage_satisfaction = fields.Integer('% Happy', compute='_compute_percentage_satisfaction', store=False, default=-1)
+    rating_percentage_satisfaction = fields.Integer(
+        '% Happy', compute='_compute_percentage_satisfaction', store=False, default=-1,
+        help="Percentage of happy ratings over the past 7 days")
 
     # images fields
     image = fields.Binary('Image', default=_default_image, attachment=True,
@@ -99,7 +102,8 @@ class ImLivechatChannel(models.Model):
     @api.depends('channel_ids.rating_ids')
     def _compute_percentage_satisfaction(self):
         for record in self:
-            repartition = record.channel_ids.rating_get_grades()
+            dt = fields.Datetime.to_string(datetime.utcnow() - timedelta(days=7))
+            repartition = record.channel_ids.rating_get_grades([('create_date', '>=', dt)])
             total = sum(repartition.values())
             if total > 0:
                 happy = repartition['great']
diff --git a/addons/im_livechat/models/mail_channel.py b/addons/im_livechat/models/mail_channel.py
index 2119baf38cc..eded0ff17da 100644
--- a/addons/im_livechat/models/mail_channel.py
+++ b/addons/im_livechat/models/mail_channel.py
@@ -58,6 +58,7 @@ class MailChannel(models.Model):
 
     @api.model
     def cron_remove_empty_session(self):
+        hours = 1 # never remove empty session created within the last hour
         self.env.cr.execute("""
             SELECT id as id
             FROM mail_channel C
@@ -65,7 +66,8 @@ class MailChannel(models.Model):
                 SELECT *
                 FROM mail_message_mail_channel_rel R
                 WHERE R.mail_channel_id = C.id
-            ) AND C.channel_type = 'livechat' AND livechat_channel_id IS NOT NULL;
-        """)
+            ) AND C.channel_type = 'livechat' AND livechat_channel_id IS NOT NULL AND
+                COALESCE(write_date, create_date, (now() at time zone 'UTC'))::timestamp
+                < ((now() at time zone 'UTC') - interval %s)""", ("%s hours" % hours,))
         empty_channel_ids = [item['id'] for item in self.env.cr.dictfetchall()]
         self.browse(empty_channel_ids).unlink()
diff --git a/addons/im_livechat/report/im_livechat_report_channel_views.xml b/addons/im_livechat/report/im_livechat_report_channel_views.xml
index d8d9ed7dcfa..7298482f9dc 100644
--- a/addons/im_livechat/report/im_livechat_report_channel_views.xml
+++ b/addons/im_livechat/report/im_livechat_report_channel_views.xml
@@ -55,7 +55,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">pivot,graph</field>
             <field name="context">{"search_default_last_week":1}</field>
-            <field name="help">Livechat Support Channel Statistics allows you to easily check and analyse your company livechat session performance. Extract informations about the missed sessions, the audiance, the duration of a session, etc.</field>
+            <field name="help">Livechat Support Channel Statistics allows you to easily check and analyse your company livechat session performance. Extract information about the missed sessions, the audiance, the duration of a session, etc.</field>
         </record>
 
         <menuitem
diff --git a/addons/im_livechat/report/im_livechat_report_operator_views.xml b/addons/im_livechat/report/im_livechat_report_operator_views.xml
index 902a16ab1ac..677191cf4b5 100644
--- a/addons/im_livechat/report/im_livechat_report_operator_views.xml
+++ b/addons/im_livechat/report/im_livechat_report_operator_views.xml
@@ -52,7 +52,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">pivot,graph</field>
             <field name="context">{"search_default_last_week":1}</field>
-            <field name="help">Livechat Support Channel Statistics allows you to easily check and analyse your company livechat session performance. Extract informations about the missed sessions, the audiance, the duration of a session, etc.</field>
+            <field name="help">Livechat Support Channel Statistics allows you to easily check and analyse your company livechat session performance. Extract information about the missed sessions, the audiance, the duration of a session, etc.</field>
         </record>
 
         <menuitem
diff --git a/addons/im_livechat/static/src/js/im_livechat.js b/addons/im_livechat/static/src/js/im_livechat.js
index 1344172fc5d..7e592dce57a 100644
--- a/addons/im_livechat/static/src/js/im_livechat.js
+++ b/addons/im_livechat/static/src/js/im_livechat.js
@@ -84,7 +84,7 @@ var LivechatButton = Widget.extend({
                 self.render_messages();
 
                 bus.add_channel(channel.uuid);
-                bus.poll();
+                bus.start_polling();
 
                 utils.set_cookie('im_livechat_session', JSON.stringify(channel), 60*60);
             }
@@ -119,7 +119,6 @@ var LivechatButton = Widget.extend({
 
     close_chat: function () {
         this.chat_window.destroy();
-        this.$el.show();
         utils.set_cookie('im_livechat_session', "", -1); // remove cookie
     },
 
diff --git a/addons/im_livechat/views/im_livechat_channel_views.xml b/addons/im_livechat/views/im_livechat_channel_views.xml
index 12ae74c9155..06cda3591ae 100644
--- a/addons/im_livechat/views/im_livechat_channel_views.xml
+++ b/addons/im_livechat/views/im_livechat_channel_views.xml
@@ -11,7 +11,7 @@
                 Click to define a new website live chat channel.
               </p><p>
                 You can create channels for each website on which you want
-                to integrate the website live chat widget, allowing you website
+                to integrate the website live chat widget, allowing your website
                 visitors to talk in real time with your operators.
               </p><p>
                 Each channel has it's own URL that you can send by email to